Merge branch 'master' into contact_dialog

[situare] / src / ui / paneltabbar.cpp

diff --git a/src/ui/paneltabbar.cpp b/src/ui/paneltabbar.cpp
index 124fd77..7efca18 100644 (file)
--- a/src/ui/paneltabbar.cpp
+++ b/src/ui/paneltabbar.cpp
@@ -22,6 +22,7 @@
 #include <QDebug>
 #include <QButtonGroup>
 
+#include "panelcommon.h"
 #include "paneltab.h"
 
 #include "paneltabbar.h"
@@ -35,6 +36,8 @@ PanelTabBar::PanelTabBar(QWidget *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    setFixedWidth(PANEL_TAB_BAR_WIDTH);
+
     m_tabButtonGroup = new QButtonGroup(this);
 
     connect(m_tabButtonGroup, SIGNAL(buttonPressed(int)),
@@ -52,6 +55,8 @@ void PanelTabBar::deselectTabs()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    m_activeTab = NO_ACTIVE_TABS;
+
     m_tabButtonGroup->setExclusive(false);
     m_tabButtonGroup->button(m_tabButtonGroup->checkedId())->setChecked(false);
     m_tabButtonGroup->setExclusive(true);
@@ -113,8 +118,20 @@ void PanelTabBar::setUpTabLayout()
     const int TAB_BUTTON_STEPPING = 65;
 
     QList<QAbstractButton *> tabList = m_tabButtonGroup->buttons();
-
+    int tabBarHeight = 0;
     for (int i = 0; i < tabList.size(); i ++) {
         tabList.at(i)->move(0, i * TAB_BUTTON_STEPPING);
+        tabBarHeight += TAB_BUTTON_STEPPING;
     }
+
+    setFixedHeight(tabBarHeight);
+
+    emit sizeChangeRequested();
+}
+
+QButtonGroup * PanelTabBar::tabs() const
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    return m_tabButtonGroup;
 }