From 24741f2e1b578cf62a0ad9763746c5e5940b06b9 Mon Sep 17 00:00:00 2001
From: Ilia Ryabokon <ilin@scand.com>
Date: Thu, 9 Aug 2012 10:20:46 +0300
Subject: [PATCH] Moving action palette to the correct place
---
src/board/UBBoardPaletteManager.cpp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index c0064762..b663bdb3 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -665,11 +665,8 @@ void UBBoardPaletteManager::addItem(const QUrl& pUrl)
mAddItemPalette->show();
mAddItemPalette->adjustSizeAndPosition();
- QRect controlGeo = UBApplication::applicationController->displayManager()->controlGeometry();
-
- mAddItemPalette->move(controlGeo.x() + ((controlGeo.width() - mAddItemPalette->geometry().width()) / 2),
- (controlGeo.y() + (controlGeo.height() - mAddItemPalette->geometry().height()) / 5));
-
+ mAddItemPalette->move((mContainer->width() - mAddItemPalette->width()) / 2,
+ (mContainer->height() - mAddItemPalette->height()) / 5);
}
void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool isInit)
@@ -831,13 +828,11 @@ void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos,
mPos = pos;
mScaleFactor = scaleFactor;
- QRect controlGeo = UBApplication::applicationController->displayManager()->controlGeometry();
-
mAddItemPalette->show();
mAddItemPalette->adjustSizeAndPosition();
- mAddItemPalette->move(controlGeo.x() + ((controlGeo.width() - mAddItemPalette->geometry().width()) / 2),
- (controlGeo.y() + (controlGeo.height() - mAddItemPalette->geometry().height()) / 5));
+ mAddItemPalette->move((mContainer->width() - mAddItemPalette->width()) / 2,
+ (mContainer->height() - mAddItemPalette->height()) / 5);
}