feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove transient scrollbars

Browse Source 
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>
This commit is contained in:
Ali Kianian
2023-04-20 14:15:51 +03:00
parent 924149e515
commit 151423ab16
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
View File

@@ -6,7 +6,6 @@
#include "formeditorwidget.h" #include "formeditorwidget.h"
#include "navigation2d.h" #include "navigation2d.h"
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/transientscroll.h>
#include <QAction> #include <QAction>
#include <QCoreApplication> #include <QCoreApplication>
@@ -37,7 +36,6 @@ FormEditorGraphicsView::FormEditorGraphicsView(QWidget *parent)
setBackgroundRole(QPalette::Window); setBackgroundRole(QPalette::Window);
activateCheckboardBackground(); activateCheckboardBackground();
Utils::TransientScrollAreaSupport::support(this);
// as mousetracking only works for mouse key it is better to handle it in the // 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 // eventFilter method so it works also for the space scrolling case as expected

5
src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
View File

@@ -70,6 +70,11 @@ void TextEditorWidget::setTextEditor(Utils::UniqueObjectLatePtr<TextEditor::Base
}); });
m_textEditor->editorWidget()->installEventFilter(this); 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);
} }
} }

1
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -186,6 +186,7 @@ void DesignModeWidget::setup()
Core::ICore::resourcePath("qmldesigner/workspacePresets/").toString()); Core::ICore::resourcePath("qmldesigner/workspacePresets/").toString());
QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/dockwidgets.css")); 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)); m_dockManager->setStyleSheet(Theme::replaceCssColors(sheet));
// Setup icons // Setup icons

6
src/plugins/qmldesignerbase/studio/studiostyle.cpp
View File

@@ -888,12 +888,6 @@ int StudioStyle::styleHint(
const QWidget *widget, const QWidget *widget,
QStyleHintReturn *returnData) const QStyleHintReturn *returnData) const
{ {
switch (hint) {
case SH_ScrollBar_Transient:
return true;
default:
break;
}
return Super::styleHint(hint, option, widget, returnData); return Super::styleHint(hint, option, widget, returnData);
} }

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -66,7 +66,6 @@
#include <utils/textutils.h> #include <utils/textutils.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <utils/tooltip/tooltip.h> #include <utils/tooltip/tooltip.h>
#include <utils/transientscroll.h>
#include <utils/uncommentselection.h> #include <utils/uncommentselection.h>
#include <QAbstractTextDocumentLayout> #include <QAbstractTextDocumentLayout>
@@ -1145,7 +1144,6 @@ TextEditorWidget::TextEditorWidget(QWidget *parent)
setLayoutDirection(Qt::LeftToRight); setLayoutDirection(Qt::LeftToRight);
viewport()->setMouseTracking(true); viewport()->setMouseTracking(true);
setFrameStyle(QFrame::NoFrame); setFrameStyle(QFrame::NoFrame);
TransientScrollAreaSupport::support(this);
} }
void TextEditorWidget::setTextDocument(const QSharedPointer<TextDocument> &doc) void TextEditorWidget::setTextDocument(const QSharedPointer<TextDocument> &doc)