Panel tab enabling/disabling when logged in/out reviewed.

[situare] / src / ui / paneltab.cpp

diff --git a/src/ui/paneltab.cpp b/src/ui/paneltab.cpp
index d12bc3d..c3ce81f 100644 (file)
--- a/src/ui/paneltab.cpp
+++ b/src/ui/paneltab.cpp
@@ -24,10 +24,11 @@
 #include <QPainter>
 #include <QRect>
 
+#include "panelcommon.h"
 #include "paneltab.h"
 
-const int TAB_WIDTH_ACTIVE = 74;
 const int TAB_HEIGHT = 66;
+const int TAB_WIDTH_ACTIVE = PANEL_TAB_BAR_WIDTH;
 
 PanelTab::PanelTab(QWidget *parent)
     : QToolButton(parent),
@@ -93,23 +94,23 @@ void PanelTab::paintEvent(QPaintEvent *event)
     Q_UNUSED(event);
 
     const int TAB_WIDTH = 66;
+    const int TAB_RECT_X = 0;
+    const int TAB_RECT_Y = 0;
 
     QPainter painter(this);
 
     if (isChecked()) {
-        ///< @todo magic
-        m_tabRect.setRect(0, 0, TAB_WIDTH_ACTIVE, TAB_HEIGHT);
+        m_tabRect.setRect(TAB_RECT_X, TAB_RECT_Y, TAB_WIDTH_ACTIVE, TAB_HEIGHT);
         painter.drawPixmap(m_tabRect, m_tabActiveImage);
     } else {
-        ///< @todo magic
-        m_tabRect.setRect(TAB_WIDTH_ACTIVE - TAB_WIDTH, 0, TAB_WIDTH, TAB_HEIGHT);
+        m_tabRect.setRect(TAB_WIDTH_ACTIVE - TAB_WIDTH, TAB_RECT_Y, TAB_WIDTH, TAB_HEIGHT);
         painter.drawPixmap(m_tabRect, m_tabInactiveImage);
     }
 
     if (isDown())
         icon().paint(&painter, m_tabRect, Qt::AlignCenter, QIcon::Selected);
-    else if (isChecked())
-        icon().paint(&painter, m_tabRect, Qt::AlignCenter, QIcon::Normal);
-    else
+    else if (!isEnabled())
         icon().paint(&painter, m_tabRect, Qt::AlignCenter, QIcon::Disabled);
+    else
+        icon().paint(&painter, m_tabRect, Qt::AlignCenter, QIcon::Normal);
 }