Fixed painting issues with draggable tabs

This fixes a few of the remaining glitches tabbar animations have:
* We no longer grab tabs but paint them through QStyle. This makes tabs
work and animate correctly when they are outside the visible region.
* Buttons now correctly follow tabs when dropped
* Gtkstyle recieved some polish to make it look more native.

Task-number: 247694, 251166
Reviewed-by: nrc

1 files changed, 4 insertions, 29 deletions

diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h
index a117aa3df3..cb1a15bfc9 100644
--- a/src/gui/widgets/qtabbar_p.h
+++ b/src/gui/widgets/qtabbar_p.h
@@ -70,7 +70,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
 class QTabBarPrivate  : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QTabBar)
@@ -78,7 +77,7 @@ public:
     QTabBarPrivate()
         :currentIndex(-1), pressedIndex(-1),
          shape(QTabBar::RoundedNorth),
-         layoutDirty(false), drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false) {}
+         layoutDirty(false), drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false), movingTab(0) {}
 
     int currentIndex;
     int pressedIndex;
@@ -98,8 +97,6 @@ public:
             , lastTab(-1)
             , timeLine(0)
             , dragOffset(0)
-            , hidLeft(false)
-            , hidRight(false)
         {}
         bool enabled;
         int shortcutId;
@@ -123,9 +120,6 @@ public:
 
         QTimeLine *timeLine;
         int dragOffset;
-        QPixmap animatingCache;
-        bool hidLeft;
-        bool hidRight;
 
         void makeTimeLine(QWidget *q) {
             if (timeLine)
@@ -135,27 +129,6 @@ public:
             q->connect(timeLine, SIGNAL(finished()), q, SLOT(_q_moveTabFinished()));
         }
 
-        void hideWidgets() {
-            if (!hidRight && rightWidget) {
-                hidRight = rightWidget->isVisible();
-                rightWidget->hide();
-            }
-
-            if (!hidLeft && leftWidget) {
-                hidLeft = leftWidget->isVisible();
-                leftWidget->hide();
-            }
-        }
-
-        void unHideWidgets() {
-            if (leftWidget && hidLeft)
-                leftWidget->show();
-            hidLeft = false;
-            if (rightWidget && hidRight)
-                rightWidget->show();
-            hidRight = false;
-        }
-
     };
     QList<Tab> tabList;
     QHash<QTimeLine*, int> animations;
@@ -184,12 +157,12 @@ public:
     void _q_moveTabFinished(int offset);
     QRect hoverRect;
 
-    void grabCache(int start, int end, bool unhide);
     void refresh();
     void layoutTabs();
     void layoutWidgets(int index = -1);
     void layoutTab(int index);
     void updateMacBorderMetrics();
+    void setupMovableTab();
 
     void makeVisible(int index);
     QSize iconSize;
@@ -206,6 +179,8 @@ public:
     bool dragInProgress;
     bool documentMode;
 
+    QWidget *movingTab;
+
     // shared by tabwidget and qtabbar
     static void initStyleBaseOption(QStyleOptionTabBarBaseV2 *optTabBase, QTabBar *tabbar, QSize size)
     {