From 77629223da3f8f37171ea1641db55bb336327f98 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 17 Aug 2012 09:00:46 +0200 Subject: [PATCH] fixed issue with add item palette that doesn't appears on desktop and web mode --- src/board/UBBoardPaletteManager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 1468e753..1b3328b8 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -677,6 +677,10 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is { case eUBDockPaletteWidget_BOARD: { + // On Application start up the mAddItemPalette isn't initialized yet + if(mAddItemPalette){ + mAddItemPalette->setParent(UBApplication::boardController->controlContainer()); + } mLeftPalette->assignParent(mContainer); mRightPalette->assignParent(mContainer); mRightPalette->stackUnder(mStylusPalette); @@ -710,6 +714,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is case eUBDockPaletteWidget_DESKTOP: { + mAddItemPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mLeftPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mRightPalette->lower(); @@ -745,7 +750,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mRightPalette->setAdditionalVOffset(30); #endif - if( !isInit ) + if(!isInit) UBApplication::applicationController->uninotesController()->TransparentWidgetResized(); if (mWebToolsCurrentPalette) @@ -755,6 +760,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is case eUBDockPaletteWidget_WEB: { + mAddItemPalette->setParent(UBApplication::mainWindow); if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) { // tmp variable?