diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp index b7f20e77a2f..9ac4a66aaff 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -61,7 +62,6 @@ TextEditorWidget::TextEditorWidget(TextEditorView *textEditorView) m_updateSelectionTimer.setInterval(200); connect(&m_updateSelectionTimer, &QTimer::timeout, this, &TextEditorWidget::updateSelectionByCursorPosition); - setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css"))))); } void TextEditorWidget::setTextEditor(TextEditor::BaseTextEditor *textEditor) @@ -85,6 +85,9 @@ void TextEditorWidget::setTextEditor(TextEditor::BaseTextEditor *textEditor) }); textEditor->editorWidget()->installEventFilter(this); + static QString styleSheet = Theme::replaceCssColors(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css")))); + textEditor->editorWidget()->verticalScrollBar()->setStyleSheet(styleSheet); + textEditor->editorWidget()->horizontalScrollBar()->setStyleSheet(styleSheet); } if (oldEditor) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 33056bf9bec..e1bff9bfb60 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -454,10 +454,6 @@ static Core::MiniSplitter *createCentralSplitter(const QList &widget SwitchSplitTabWidget *switchSplitTabWidget = new SwitchSplitTabWidget(); - QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/centerwidget.css")); - switchSplitTabWidget->setStyleSheet(Theme::replaceCssColors(sheet)); - - foreach (const WidgetInfo &widgetInfo, widgetInfos) { if (widgetInfo.placementHint == widgetInfo.CentralPane) switchSplitTabWidget->addTab(widgetInfo.widget, widgetInfo.tabName); diff --git a/src/plugins/qmldesigner/switchsplittabwidget.cpp b/src/plugins/qmldesigner/switchsplittabwidget.cpp index 08ad71ef12b..6fcc98beb5c 100644 --- a/src/plugins/qmldesigner/switchsplittabwidget.cpp +++ b/src/plugins/qmldesigner/switchsplittabwidget.cpp @@ -24,8 +24,10 @@ ****************************************************************************/ #include "switchsplittabwidget.h" +#include #include +#include #include #include @@ -48,6 +50,9 @@ SwitchSplitTabWidget::SwitchSplitTabWidget(QWidget *parent) m_splitter->setObjectName("centralTabWidget"); m_splitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/centerwidget.css")); + m_tabBarBackground->setStyleSheet(Theme::replaceCssColors(sheet)); + m_tabBar->setObjectName("centralTabBar"); m_tabBar->setShape(QTabBar::RoundedEast); m_tabBar->setDocumentMode(false);