Changed bar width to width of four buttons, review

[situare] / src / ui / listitemcontextbuttonbar.cpp

diff --git a/src/ui/listitemcontextbuttonbar.cpp b/src/ui/listitemcontextbuttonbar.cpp
index 3d5791e..7103244 100644 (file)
--- a/src/ui/listitemcontextbuttonbar.cpp
+++ b/src/ui/listitemcontextbuttonbar.cpp
@@ -20,6 +20,7 @@
 */
 
 #include <QDebug>
+#include <QLayout>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QStateMachine>
@@ -41,10 +42,26 @@ ListItemContextButtonBar::ListItemContextButtonBar(QWidget *parent) :
     const int BAR_HEIGHT = 78;
     setFixedHeight(BAR_HEIGHT);
 
+    const int BUTTON_WIDTH = 74;
+    const int BUTTON_COUNT = 4;
+    const int HORIZONTAL_MARGIN = 10;
+    setFixedWidth(BUTTON_COUNT * BUTTON_WIDTH + 2 * HORIZONTAL_MARGIN);
+
     m_backgroundLeft = new QPixmap(":/res/images/list_item_context_button_bar_left.png");
     m_backgroundMiddle = new QPixmap(":/res/images/list_item_context_button_bar_tile.png");
     m_backgroundRight = new QPixmap(":/res/images/list_item_context_button_bar_right.png");
 
+    // --- LAYOUT ---
+    m_barLayout = new QHBoxLayout();
+    setLayout(m_barLayout);
+    m_barLayout->setContentsMargins(0, 0, 0, 0);
+
+    // --- SET POSITION ---
+    // center this widget horizontally to middle of the panel contents area and set outside of
+    // the view
+    const int FROM_PANEL_CONTENTS_LEFT = PANEL_WIDTH / 2 - width() / 2;
+    move(PANEL_TAB_BAR_WIDTH + PANEL_BAR_WIDTH + FROM_PANEL_CONTENTS_LEFT, -size().height());
+
     // --- ANIMATION ---
     const int ANIMATION_DURATION_MS = 150;
 
@@ -53,6 +70,11 @@ ListItemContextButtonBar::ListItemContextButtonBar(QWidget *parent) :
 
     connect(m_animation, SIGNAL(finished()),
             this, SLOT(onAnimationFinished()));
+
+    // target values for animations
+    m_animation->setStartValue(pos());
+    const int Y = 0;
+    m_animation->setEndValue(QPoint(pos().x(), Y));
 }
 
 ListItemContextButtonBar::~ListItemContextButtonBar()
@@ -78,25 +100,16 @@ void ListItemContextButtonBar::changeButtons()
     if (!isVisible())
         show();
 
-    // Hide previous buttons (if any)
-    if (m_contextButtons)
+    // Remove old buttons (if any)
+    if (m_contextButtons) {
+        m_barLayout->removeWidget(m_contextButtons);
         m_contextButtons->setParent(0);
+    }
 
     m_contextButtons = m_newContextButtons;
     m_newContextButtons = 0;
-    m_contextButtons->setParent(this);
-    m_contextButtons->show();
-    setFixedWidth(m_contextButtons->width());
-
-    // center this widget horizontally to middle of the panel contents area and set outside of
-    // the view
-    const int FROM_PANEL_CONTENTS_LEFT = PANEL_WIDTH / 2 - m_contextButtons->width() / 2;
-    move(PANEL_TAB_BAR_WIDTH + PANEL_BAR_WIDTH + FROM_PANEL_CONTENTS_LEFT, -size().height());
 
-    // update new target values for animations
-    m_animation->setStartValue(pos());
-    const int Y = 0;
-    m_animation->setEndValue(QPoint(pos().x(), Y));
+    m_barLayout->addWidget(m_contextButtons, 0, Qt::AlignHCenter);
 }
 
 void ListItemContextButtonBar::hideContextButtonBar()
@@ -178,7 +191,9 @@ void ListItemContextButtonBar::showContextButtonBar()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_state = StateOpening;
-    m_animation->setDirection(QAbstractAnimation::Forward);
-    m_animation->start();
+    if (m_contextButtons->layout()->count() > 0) {
+        m_state = StateOpening;
+        m_animation->setDirection(QAbstractAnimation::Forward);
+        m_animation->start();
+    }
 }