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

preferencesAboutTextFull
Aleksei Kanash 13 years ago
parent 81a2a555c9
commit 0798539824
  1. 4
      src/board/UBBoardPaletteManager.cpp
  2. 2
      src/web/UBWebController.cpp

@ -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()
{ {
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)

Loading…
Cancel
Save