From 1320a6cf036c87a94fb30d5a2697888baa5ec69c Mon Sep 17 00:00:00 2001
From: "S. Razi Alavizadeh" <srazi61@yahoo.com>
Date: Wed, 20 Feb 2013 23:52:38 +0330
Subject: [PATCH] [Mac] Fixed rendering of tab's buttons.

---
 src/lib/webview/tabbar.cpp    | 27 ++++++++++++++++++---------
 src/lib/webview/tabbar.h      |  3 +++
 src/lib/webview/tabwidget.cpp | 10 +++++-----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/lib/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp
index 8c91662a9..f4a968804 100644
--- a/src/lib/webview/tabbar.cpp
+++ b/src/lib/webview/tabbar.cpp
@@ -319,7 +319,7 @@ void TabBar::showCloseButton(int index)
     }
 
     WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(index));
-    QAbstractButton* button = qobject_cast<QAbstractButton*>(tabButton(index, QTabBar::RightSide));
+    QAbstractButton* button = qobject_cast<QAbstractButton*>(tabButton(index, closeButtonPosition()));
 
     if (button || (webTab && webTab->isPinned())) {
         return;
@@ -327,7 +327,7 @@ void TabBar::showCloseButton(int index)
 
     QAbstractButton* closeButton = new CloseButton(this);
     connect(closeButton, SIGNAL(clicked()), this, SLOT(closeTabFromButton()));
-    setTabButton(index, QTabBar::RightSide, closeButton);
+    setTabButton(index, closeButtonPosition(), closeButton);
 }
 
 void TabBar::hideCloseButton(int index)
@@ -336,12 +336,12 @@ void TabBar::hideCloseButton(int index)
         return;
     }
 
-    CloseButton* button = qobject_cast<CloseButton*>(tabButton(index, QTabBar::RightSide));
+    CloseButton* button = qobject_cast<CloseButton*>(tabButton(index, closeButtonPosition()));
     if (!button) {
         return;
     }
 
-    setTabButton(index, QTabBar::RightSide, 0);
+    setTabButton(index, closeButtonPosition(), 0);
     button->deleteLater();
 }
 
@@ -352,7 +352,7 @@ void TabBar::updatePinnedTabCloseButton(int index)
     }
 
     WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(index));
-    QAbstractButton* button = qobject_cast<QAbstractButton*>(tabButton(index, QTabBar::RightSide));
+    QAbstractButton* button = qobject_cast<QAbstractButton*>(tabButton(index, closeButtonPosition()));
 
     bool pinned = webTab && webTab->isPinned();
 
@@ -383,7 +383,7 @@ void TabBar::closeTabFromButton()
     int tabToClose = -1;
 
     for (int i = 0; i < count(); ++i) {
-        if (tabButton(i, QTabBar::RightSide) == button) {
+        if (tabButton(i, closeButtonPosition()) == button) {
             tabToClose = i;
             break;
         }
@@ -463,6 +463,16 @@ int TabBar::normalTabsCount()
     return count() - m_pinnedTabsCount;
 }
 
+QTabBar::ButtonPosition TabBar::iconButtonPosition()
+{
+    return (closeButtonPosition() == QTabBar::RightSide ? QTabBar::LeftSide : QTabBar::RightSide);
+}
+
+QTabBar::ButtonPosition TabBar::closeButtonPosition()
+{
+    return (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this);
+}
+
 void TabBar::showTabPreview()
 {
     WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(m_tabPreview->previewIndex()));
@@ -709,10 +719,9 @@ void CloseButton::paintEvent(QPaintEvent*)
         opt.state |= QStyle::State_Sunken;
     }
 
-    if (const QTabBar* tb = qobject_cast<const QTabBar*>(parent())) {
+    if (TabBar* tb = qobject_cast<TabBar*>(parent())) {
         int index = tb->currentIndex();
-        QTabBar::ButtonPosition position = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tb);
-        if (tb->tabButton(index, position) == this) {
+        if (tb->tabButton(index, tb->closeButtonPosition()) == this) {
             opt.state |= QStyle::State_Selected;
         }
     }
diff --git a/src/lib/webview/tabbar.h b/src/lib/webview/tabbar.h
index be5573575..f04daaaa6 100644
--- a/src/lib/webview/tabbar.h
+++ b/src/lib/webview/tabbar.h
@@ -42,6 +42,9 @@ public:
     int pinnedTabsCount();
     int normalTabsCount();
 
+    QTabBar::ButtonPosition iconButtonPosition();
+    QTabBar::ButtonPosition closeButtonPosition();
+
     void updatePinnedTabCloseButton(int index);
 
     void disconnectObjects();
diff --git a/src/lib/webview/tabwidget.cpp b/src/lib/webview/tabwidget.cpp
index 410c141d6..b29cdff74 100644
--- a/src/lib/webview/tabwidget.cpp
+++ b/src/lib/webview/tabwidget.cpp
@@ -468,10 +468,10 @@ void TabWidget::startTabAnimation(int index)
         return;
     }
 
-    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, QTabBar::LeftSide));
+    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
     if (!label) {
         label = new QLabel();
-        m_tabBar->setTabButton(index, QTabBar::LeftSide, label);
+        m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label);
     }
 
     if (label->movie()) {
@@ -492,7 +492,7 @@ void TabWidget::stopTabAnimation(int index)
         return;
     }
 
-    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, QTabBar::LeftSide));
+    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
 
     if (label && label->movie()) {
         label->movie()->stop();
@@ -512,11 +512,11 @@ void TabWidget::setTabIcon(int index, const QIcon &icon)
         return;
     }
 
-    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, QTabBar::LeftSide));
+    QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
     if (!label) {
         label = new QLabel();
         label->resize(16, 16);
-        m_tabBar->setTabButton(index, QTabBar::LeftSide, label);
+        m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label);
     }
 
     label->setPixmap(icon.pixmap(16, 16));