Added panel bar width to mask calculation.

[situare] / src / ui / tabbedpanel.cpp

diff --git a/src/ui/tabbedpanel.cpp b/src/ui/tabbedpanel.cpp
index 44a3fd0..50f0344 100644 (file)
--- a/src/ui/tabbedpanel.cpp
+++ b/src/ui/tabbedpanel.cpp
@@ -69,7 +69,7 @@ TabbedPanel::TabbedPanel(QWidget *parent)
 
     // --- BAR ---
     m_panelBar = new PanelBar(this);
-    m_panelBar->move(PANEL_TAB_WIDTH, PANEL_TOP_Y);
+    m_panelBar->move(PANEL_TAB_BAR_WIDTH, PANEL_TOP_Y);
 
     // --- CONTEXT BUTTON BAR ---
     m_panelContextButtonBar = new PanelContextButtonBar(this);
@@ -83,7 +83,7 @@ TabbedPanel::TabbedPanel(QWidget *parent)
 
     // --- PANEL CONTENT ---
     m_panelContentStack = new PanelContentStack(this);
-    m_panelContentStack->move(PANEL_TAB_WIDTH + PANEL_BAR_WIDTH, PANEL_TOP_Y);
+    m_panelContentStack->move(PANEL_TAB_BAR_WIDTH + PANEL_BAR_WIDTH, PANEL_TOP_Y);
 
     // --- PANEL ANIMATION ---
     QStateMachine *panelStateMachine = new QStateMachine(this);
@@ -143,7 +143,7 @@ void TabbedPanel::calculateMask()
                                       panelContextButtonBarRect.width(),
                                       panelContextButtonBarRect.height());
     QRegion panelContentRegion(panelTabBarRect.right() + 1, 0,
-                               PANEL_WIDTH, height());
+                               PANEL_WIDTH + PANEL_BAR_WIDTH, height());
     QRegion panelRegion = panelTabBarRegion + panelContentRegion + panelContextButtonBarRegion;
 
     setMask(panelRegion);
@@ -219,9 +219,9 @@ void TabbedPanel::resizePanel(const QSize &size)
            size.height() - PANEL_TOP_PADDING - PANEL_BOTTOM_PADDING);
 
     if (!m_open)
-        move(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH, PANEL_TOP_PADDING);
+        move(size.width() - PANEL_TAB_BAR_WIDTH - PANEL_BAR_WIDTH, PANEL_TOP_PADDING);
     else
-        move(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH - PANEL_WIDTH, PANEL_TOP_PADDING);
+        move(size.width() - PANEL_TAB_BAR_WIDTH - PANEL_BAR_WIDTH - PANEL_WIDTH, PANEL_TOP_PADDING);
 
     m_panelBar->resizeBar(size);
 
@@ -229,10 +229,10 @@ void TabbedPanel::resizePanel(const QSize &size)
 
     m_panelContentStack->resizeContentStack(size);
 
-    QPoint closedPosition(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH, PANEL_TOP_PADDING);
+    QPoint closedPosition(size.width() - PANEL_TAB_BAR_WIDTH - PANEL_BAR_WIDTH, PANEL_TOP_PADDING);
     m_stateClosed->assignProperty(this, "pos", closedPosition);
 
-    QPoint openedPosition(size.width() - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH - PANEL_WIDTH,
+    QPoint openedPosition(size.width() - PANEL_TAB_BAR_WIDTH - PANEL_BAR_WIDTH - PANEL_WIDTH,
                           PANEL_TOP_PADDING);
     m_stateOpened->assignProperty(this, "pos", openedPosition);