Commit 07985398 authored by Aleksei Kanash's avatar Aleksei Kanash

Fix to SANKORE-534. WebMenu toolbar and keyboard doesn't disappears on mac now.

parent 81a2a555
...@@ -731,11 +731,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is ...@@ -731,11 +731,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
if(mKeyboardPalette->m_isVisible) if(mKeyboardPalette->m_isVisible)
{ {
mKeyboardPalette->hide(); mKeyboardPalette->hide();
mKeyboardPalette->setParent(brWnd); mKeyboardPalette->setParent(UBApplication::mainWindow);
mKeyboardPalette->show(); mKeyboardPalette->show();
} }
else else
mKeyboardPalette->setParent(brWnd); mKeyboardPalette->setParent(UBApplication::mainWindow);
} }
} }
......
...@@ -423,7 +423,7 @@ void UBWebController::setupPalettes() ...@@ -423,7 +423,7 @@ void UBWebController::setupPalettes()
{ {
if(!(*mToolsCurrentPalette)) if(!(*mToolsCurrentPalette))
{ {
(*mToolsCurrentPalette) = new UBWebToolsPalette((*mCurrentWebBrowser),false); (*mToolsCurrentPalette) = new UBWebToolsPalette(UBApplication::mainWindow, false);
#ifndef Q_WS_WIN #ifndef Q_WS_WIN
if (UBPlatformUtils::hasVirtualKeyboard() && UBApplication::boardController->paletteManager()->mKeyboardPalette) if (UBPlatformUtils::hasVirtualKeyboard() && UBApplication::boardController->paletteManager()->mKeyboardPalette)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment