Revert "Fix tabbar issues with Oxygen style"

The patch has some issues with text eliding which are not really
possible to solve properly without providing the elidemode
to the styleoption. Under these circumstances it seems better
just to fix the problem in Oxygen itself which has already been
patched when compiled with 4.5.

This reverts commit d7072b5577e3c07e984885cf05d5f9b217c6f473.

1 files changed, 32 insertions, 41 deletions

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 819965b..3cae08a 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -1779,46 +1779,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
     case CE_TabBarTab:
         if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
             drawControl(CE_TabBarTabShape, tab, p, widget);
-
-            QStyleOptionTabV3 tabV3(*tab);
-            QRect labelRect = tabV3.rect;
-            QSize &left= tabV3.leftButtonSize;
-            QSize &right = tabV3.rightButtonSize;
-            const int spacing = 6 + 2;
-
-            // left widget
-            if (!left.isEmpty()) {
-                if (tabV3.shape == QTabBar::RoundedEast || tabV3.shape == QTabBar::TriangularEast )
-                    labelRect.setTop(labelRect.top() + spacing + left.height());
-                else if (tabV3.shape == QTabBar::RoundedWest|| tabV3.shape == QTabBar::TriangularWest)
-                    labelRect.setBottom(labelRect.bottom() - spacing - left.height());
-                else
-                    labelRect.setLeft(labelRect.left() + spacing + left.width());
-            }
-
-            // right widget
-            if (!right.isEmpty()) {
-                if (tabV3.shape == QTabBar::RoundedEast || tabV3.shape == QTabBar::TriangularEast )
-                    labelRect.setBottom(labelRect.bottom() - spacing - right.height());
-                else if (tabV3.shape == QTabBar::RoundedWest|| tabV3.shape == QTabBar::TriangularWest)
-                    labelRect.setTop(labelRect.top() + spacing + right.height());
-                else
-                    labelRect.setRight(labelRect.right() - spacing - right.width());
-            }
-
-            tabV3.rect = visualRect(opt->direction, opt->rect, labelRect);
-            drawControl(CE_TabBarTabLabel, &tabV3, p, widget);
-            if (tabV3.state & State_HasFocus) {
-                const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth);
-                int x1, x2;
-                x1 = tab->rect.left();
-                x2 = tab->rect.right() - 1;
-                QStyleOptionFocusRect fropt;
-                fropt.QStyleOption::operator=(*tab);
-                fropt.rect.setRect(x1 + 1 + OFFSET, tab->rect.y() + OFFSET,
-                                   x2 - x1 - 2*OFFSET, tab->rect.height() - 2*OFFSET);
-                drawPrimitive(PE_FrameFocusRect, &fropt, p, widget);
-            }
+            drawControl(CE_TabBarTabLabel, tab, p, widget);
         }
         break;
     case CE_TabBarTabShape:
@@ -2020,8 +1981,12 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                                                     (tabV2.state & State_Enabled) ? QIcon::Normal
                                                                                   : QIcon::Disabled);
 
-                int offset = 6;
+                int offset = 4;
                 int left = opt->rect.left();
+                if (tabV2.leftButtonSize.isEmpty())
+                    offset += 2;
+                else
+                    left += tabV2.leftButtonSize.width() + (6 + 2) + 2;
                 QRect iconRect = QRect(left + offset, tr.center().y() - tabIcon.height() / 2,
                             tabIconSize.width(), tabIconSize.height());
                 if (!verticalTabs)
@@ -2032,6 +1997,20 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
             drawItemText(p, tr, alignment, tab->palette, tab->state & State_Enabled, tab->text, QPalette::WindowText);
             if (verticalTabs)
                 p->restore();
+
+            if (tabV2.state & State_HasFocus) {
+                const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth);
+
+                int x1, x2;
+                x1 = tabV2.rect.left();
+                x2 = tabV2.rect.right() - 1;
+
+                QStyleOptionFocusRect fropt;
+                fropt.QStyleOption::operator=(*tab);
+                fropt.rect.setRect(x1 + 1 + OFFSET, tabV2.rect.y() + OFFSET,
+                                   x2 - x1 - 2*OFFSET, tabV2.rect.height() - 2*OFFSET);
+                drawPrimitive(PE_FrameFocusRect, &fropt, p, widget);
+            }
         }
         break;
 #endif // QT_NO_TABBAR
@@ -2879,6 +2858,12 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 tr.setRight(tr.right() - horizontalShift);
             }
 
+            // left widget
+            if (!tabV2.leftButtonSize.isEmpty()) {
+                tr.setLeft(tr.left() + 6 + 2 +
+                    (verticalTabs ? tabV2.leftButtonSize.height() : tabV2.leftButtonSize.width()));
+            }
+
             // icon
             if (!tabV2.icon.isNull()) {
                 QSize iconSize = tabV2.iconSize;
@@ -2900,6 +2885,12 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 tr.setLeft(tr.left() + tabIconSize.width() + offset + 2);
             }
 
+            // right widget
+            if (!tabV2.rightButtonSize.isEmpty()) {
+                tr.setRight(tr.right() - 6 - 2 -
+                    (verticalTabs ? tabV2.rightButtonSize.height() : tabV2.rightButtonSize.width()));
+            }
+
             if (!verticalTabs)
                 tr = visualRect(opt->direction, opt->rect, tr);
             r = tr;