QmlDesigner: Remove transient scrollbars

The concept of the transient scrollbar still exists, but all used cases
are removed.

Task-number: QDS-9735
Change-Id: I16c57635a5eeb114b906ab74bbf24a8693897557
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

5 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
index a9401480f3..1e67884ad8 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
@@ -6,7 +6,6 @@
 #include "formeditorwidget.h"
 #include "navigation2d.h"
 #include <utils/hostosinfo.h>
-#include <utils/transientscroll.h>
 
 #include <QAction>
 #include <QCoreApplication>
@@ -37,7 +36,6 @@ FormEditorGraphicsView::FormEditorGraphicsView(QWidget *parent)
     setBackgroundRole(QPalette::Window);
 
     activateCheckboardBackground();
-    Utils::TransientScrollAreaSupport::support(this);
 
     // as mousetracking only works for mouse key it is better to handle it in the
     // eventFilter method so it works also for the space scrolling case as expected
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
index 122228f208..9f4bb59231 100644
--- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
@@ -70,6 +70,11 @@ void TextEditorWidget::setTextEditor(Utils::UniqueObjectLatePtr<TextEditor::Base
         });
 
         m_textEditor->editorWidget()->installEventFilter(this);
+
+        static QString styleSheet = Theme::replaceCssColors(
+            QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
+        m_textEditor->editorWidget()->verticalScrollBar()->setStyleSheet(styleSheet);
+        m_textEditor->editorWidget()->horizontalScrollBar()->setStyleSheet(styleSheet);
     }
 }
 
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 40e455f40c..913fb05f0b 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -186,6 +186,7 @@ void DesignModeWidget::setup()
         Core::ICore::resourcePath("qmldesigner/workspacePresets/").toString());
 
     QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/dockwidgets.css"));
+    sheet += QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"));
     m_dockManager->setStyleSheet(Theme::replaceCssColors(sheet));
 
     // Setup icons
diff --git a/src/plugins/qmldesignerbase/studio/studiostyle.cpp b/src/plugins/qmldesignerbase/studio/studiostyle.cpp
index 4b2f113227..ffe652e363 100644
--- a/src/plugins/qmldesignerbase/studio/studiostyle.cpp
+++ b/src/plugins/qmldesignerbase/studio/studiostyle.cpp
@@ -888,12 +888,6 @@ int StudioStyle::styleHint(
         const QWidget *widget,
         QStyleHintReturn *returnData) const
 {
-    switch (hint) {
-    case SH_ScrollBar_Transient:
-        return true;
-    default:
-        break;
-    }
     return Super::styleHint(hint, option, widget, returnData);
 }
 
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index f348aa7ce6..7e50d46927 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -66,7 +66,6 @@
 #include <utils/textutils.h>
 #include <utils/theme/theme.h>
 #include <utils/tooltip/tooltip.h>
-#include <utils/transientscroll.h>
 #include <utils/uncommentselection.h>
 
 #include <QAbstractTextDocumentLayout>
@@ -1145,7 +1144,6 @@ TextEditorWidget::TextEditorWidget(QWidget *parent)
     setLayoutDirection(Qt::LeftToRight);
     viewport()->setMouseTracking(true);
     setFrameStyle(QFrame::NoFrame);
-    TransientScrollAreaSupport::support(this);
 }
 
 void TextEditorWidget::setTextDocument(const QSharedPointer<TextDocument> &doc)