From 74b53f64f7071a8b446799c08373a8b949cb2b58 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 23 Mar 2012 15:43:21 +0100 Subject: [PATCH] Fixed and simpliflied the code that handle the click on dock palette --- src/gui/UBDockPalette.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 3495f803..d62c0c7b 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -744,26 +744,14 @@ void UBTabDockPalette::mouseReleaseEvent(QMouseEvent *event) int clickedTab = 0; // If the clicked position is in the tab, perform the related action - if(eUBDockOrientation_Left == dock->mOrientation) { - if(dock->mMousePressPos.y() >= dock->mHTab && - dock->mMousePressPos.x() <= width() && - dock->mMousePressPos.y() <= dock->mHTab + nbTabs * TABSIZE + (nbTabs -1)*dock->tabSpacing()) { + if(dock->mMousePressPos.x() >= 0 && + dock->mMousePressPos.x() <= width() && + dock->mMousePressPos.y() >= 0 && + dock->mMousePressPos.y() <= nbTabs * TABSIZE + (nbTabs -1)*dock->tabSpacing()) { - clickedTab = (dock->mMousePressPos.y() - dock->mHTab) / (TABSIZE + dock->tabSpacing()); - dock->tabClicked(clickedTab); - } - - } else if (eUBDockOrientation_Right == dock->mOrientation) { - if(dock->mMousePressPos.x() >= 0 && - dock->mMousePressPos.x() <= width() && - dock->mMousePressPos.y() >= 0 && - dock->mMousePressPos.y() <= nbTabs * TABSIZE + (nbTabs -1) * dock->tabSpacing()) { - - clickedTab = (dock->mMousePressPos.y())/(TABSIZE+dock->tabSpacing()); - dock->tabClicked(clickedTab); - } + clickedTab = (dock->mMousePressPos.y()) / (TABSIZE + dock->tabSpacing()); + dock->tabClicked(clickedTab); } } - dock->mCanResize = false; }