forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user