From 0798539824ee527e2516b51b3e8679497ecdb929 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 7 May 2012 18:32:09 +0300 Subject: [PATCH] Fix to SANKORE-534. WebMenu toolbar and keyboard doesn't disappears on mac now. --- src/board/UBBoardPaletteManager.cpp | 4 ++-- src/web/UBWebController.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 980a6911..df5aa41b 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -731,11 +731,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is if(mKeyboardPalette->m_isVisible) { mKeyboardPalette->hide(); - mKeyboardPalette->setParent(brWnd); + mKeyboardPalette->setParent(UBApplication::mainWindow); mKeyboardPalette->show(); } else - mKeyboardPalette->setParent(brWnd); + mKeyboardPalette->setParent(UBApplication::mainWindow); } } diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index ca46e500..2e975868 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -423,7 +423,7 @@ void UBWebController::setupPalettes() { if(!(*mToolsCurrentPalette)) { - (*mToolsCurrentPalette) = new UBWebToolsPalette((*mCurrentWebBrowser),false); + (*mToolsCurrentPalette) = new UBWebToolsPalette(UBApplication::mainWindow, false); #ifndef Q_WS_WIN if (UBPlatformUtils::hasVirtualKeyboard() && UBApplication::boardController->paletteManager()->mKeyboardPalette)