From 47496501eb9682923fd4dcac80937c61b92aa803 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Tue, 11 Feb 2014 10:53:50 +0100
Subject: [PATCH] [ComboTabBar] Correctly set height of pinned tabbar

Both tabbars will now have the same height.
This commit fixes incorrect drawing of line under pinned tabs when
moving tabs with Oxygen theme.

Also removed unused maxVisiblePinnedTabs property
---
 src/lib/tools/combotabbar.cpp | 17 +++++------------
 src/lib/tools/combotabbar.h   |  1 -
 src/lib/webview/tabbar.cpp    |  1 -
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/lib/tools/combotabbar.cpp b/src/lib/tools/combotabbar.cpp
index d19041728..008c8b589 100644
--- a/src/lib/tools/combotabbar.cpp
+++ b/src/lib/tools/combotabbar.cpp
@@ -41,7 +41,6 @@ ComboTabBar::ComboTabBar(QWidget* parent)
     : QWidget(parent)
     , m_mainTabBar(0)
     , m_pinnedTabBar(0)
-    , m_maxVisiblePinnedTab(0)
     , m_mainBarOverFlowed(false)
     , m_dragOffset(0)
     , m_usesScrollButtons(false)
@@ -457,12 +456,6 @@ bool ComboTabBar::isPinned(int index) const
     return index >= 0 && index < pinnedTabsCount();
 }
 
-void ComboTabBar::setMaxVisiblePinnedTab(int max)
-{
-    m_maxVisiblePinnedTab = max;
-    setMinimumWidths();
-}
-
 void ComboTabBar::setObjectName(const QString &name)
 {
     m_mainTabBar->setObjectName(name);
@@ -505,6 +498,11 @@ void ComboTabBar::setUpLayout()
     m_pinnedTabBarWidget->setUpLayout();
 
     setMinimumWidths();
+
+    if (isVisible()) {
+        // ComboTabBar is now visible, we can sync heights of both tabbars
+        m_pinnedTabBar->setFixedHeight(m_mainTabBar->height());
+    }
 }
 
 void ComboTabBar::insertCloseButton(int index)
@@ -744,11 +742,6 @@ void ComboTabBar::setMinimumWidths()
 
     int pinnedTabBarWidth = pinnedTabsCount() * comboTabBarPixelMetric(PinnedTabWidth);
     m_pinnedTabBar->setMinimumWidth(pinnedTabBarWidth);
-
-    if (m_maxVisiblePinnedTab > 0) {
-        pinnedTabBarWidth = qMin(pinnedTabBarWidth, m_maxVisiblePinnedTab * comboTabBarPixelMetric(PinnedTabWidth));
-    }
-
     m_pinnedTabBarWidget->setMaximumWidth(pinnedTabBarWidth);
 
     int mainTabBarWidth = comboTabBarPixelMetric(NormalTabMinimumWidth) * (m_mainTabBar->count() - 1) +
diff --git a/src/lib/tools/combotabbar.h b/src/lib/tools/combotabbar.h
index 19e316a99..58889d60a 100644
--- a/src/lib/tools/combotabbar.h
+++ b/src/lib/tools/combotabbar.h
@@ -171,7 +171,6 @@ private:
     TabBarScrollWidget* m_mainTabBarWidget;
     TabBarScrollWidget* m_pinnedTabBarWidget;
 
-    int m_maxVisiblePinnedTab;
     QString m_closeButtonsToolTip;
     bool m_mainBarOverFlowed;
     int m_dragOffset;
diff --git a/src/lib/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp
index c6131ca02..c26be7fd1 100644
--- a/src/lib/webview/tabbar.cpp
+++ b/src/lib/webview/tabbar.cpp
@@ -78,7 +78,6 @@ TabBar::TabBar(QupZilla* mainClass, TabWidget* tabWidget)
     // ComboTabBar features
     setUsesScrollButtons(true);
     setCloseButtonsToolTip(QupZilla::tr("Close Tab"));
-    setMaxVisiblePinnedTab(0);
     connect(this, SIGNAL(overFlowChanged(bool)), this, SLOT(overFlowChange(bool)));
     connect(this, SIGNAL(scrollBarValueChanged(int)), this, SLOT(hideTabPreview()));
 }