diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp index 4363ad2ae75..8608b195d28 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.cpp +++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp @@ -176,6 +176,11 @@ QIcon Theme::iconFromName(Icon i, QColor c) return Utils::StyleHelper::getIconFromIconFont(fontName, Theme::getIconUnicode(i), 32, 32, color); } +int Theme::toolbarSize() +{ + return 41; +} + QColor Theme::qmlDesignerBackgroundColorDarker() const { return getColor(QmlDesigner_BackgroundColorDarker); diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h index f74a21f8da9..118e3386551 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.h +++ b/src/plugins/qmldesigner/components/componentcore/theme.h @@ -336,6 +336,8 @@ public: static QIcon iconFromName(Theme::Icon i, QColor c = {}); + static int toolbarSize(); + Q_INVOKABLE QColor qmlDesignerBackgroundColorDarker() const; Q_INVOKABLE QColor qmlDesignerBackgroundColorDarkAlternate() const; Q_INVOKABLE QColor qmlDesignerTabLight() const; diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp index 00779cbe516..946b31cd530 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp @@ -72,6 +72,7 @@ ConnectionViewWidget::ConnectionViewWidget(QWidget *parent) : const QList buttons = createToolBarWidgets(); + ui->toolBar->setFixedHeight(41); for (auto toolButton : buttons) ui->toolBar->addWidget(toolButton); diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp index 45789da1deb..f54b18013b3 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp @@ -39,6 +39,7 @@ CurveEditorToolBar::CurveEditorToolBar(CurveEditorModel *model, QWidget* parent) { setFloatable(false); + setFixedHeight(Theme::toolbarSize()); setContentsMargins(0, 0, 0, 0); QAction *tangentLinearAction = addAction(Theme::iconFromName(Theme::linear_medium), "Linear"); @@ -111,6 +112,7 @@ CurveEditorToolBar::CurveEditorToolBar(CurveEditorModel *model, QWidget* parent) addWidget(durationWidget); auto *positionBox = new QHBoxLayout; + positionBox->setContentsMargins(0, 0, 0, 0); positionBox->addWidget(new QLabel(tr("Current Frame"))); positionBox->addWidget(m_currentSpin); diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index 4eaed42a11b..3e3236c7f2e 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp @@ -3,6 +3,8 @@ #include "toolbox.h" +#include + #include #include #include @@ -17,6 +19,7 @@ ToolBox::ToolBox(SeekerSlider *seeker, QWidget *parentWidget) m_rightToolBar(new QToolBar(QLatin1String("RightSidebar"), this)), m_seeker(seeker) { + setProperty("panelwidget", false); m_leftToolBar->setFloatable(true); m_leftToolBar->setMovable(true); m_leftToolBar->setOrientation(Qt::Horizontal); @@ -25,15 +28,19 @@ ToolBox::ToolBox(SeekerSlider *seeker, QWidget *parentWidget) horizontalLayout->setContentsMargins(0, 0, 0, 0); horizontalLayout->setSpacing(0); + setFixedHeight(Theme::toolbarSize()); + auto stretchToolbar = new QToolBar(this); - m_leftToolBar->setProperty("panelwidget", true); + m_leftToolBar->setProperty("panelwidget", false); m_leftToolBar->setProperty("panelwidget_singlerow", false); + m_leftToolBar->setFixedHeight(Theme::toolbarSize()); - m_rightToolBar->setProperty("panelwidget", true); + m_rightToolBar->setProperty("panelwidget", false); m_rightToolBar->setProperty("panelwidget_singlerow", false); + m_rightToolBar->setFixedHeight(Theme::toolbarSize()); - stretchToolbar->setProperty("panelwidget", true); + stretchToolbar->setProperty("panelwidget", false); stretchToolbar->setProperty("panelwidget_singlerow", false); stretchToolbar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp index 4bd323ab6b1..41857346762 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp @@ -147,7 +147,7 @@ QToolBar *NavigatorWidget::createToolBar() const QList buttons = createToolBarWidgets(); auto toolBar = new QToolBar(); - toolBar->setFixedHeight(41); + toolBar->setFixedHeight(Theme::toolbarSize()); for (auto toolButton : buttons) toolBar->addWidget(toolButton); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 4f928959699..54553919ab4 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -96,7 +96,7 @@ TimelineToolBar::TimelineToolBar(QWidget *parent) , m_grp() { setContentsMargins(0, 0, 0, 0); - setFixedHeight(41); + setFixedHeight(Theme::toolbarSize()); createLeftControls(); createCenterControls(); createRightControls(); diff --git a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp index 09a3ea61189..27c304fb4df 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp @@ -94,7 +94,7 @@ void ToolBar::createStatusBar() auto quickWidget = new QQuickWidget; - quickWidget->setFixedHeight(41); + quickWidget->setFixedHeight(Theme::toolbarSize()); quickWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); quickWidget->setMinimumWidth(200); quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); @@ -113,7 +113,7 @@ void ToolBar::createStatusBar() } Core::ICore::statusBar()->addWidget(quickWidget); - Core::ICore::statusBar()->setFixedHeight(41); + Core::ICore::statusBar()->setFixedHeight(Theme::toolbarSize()); } bool ToolBar::isVisible() diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp index d8f1741994b..df9b4935476 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp @@ -83,6 +83,7 @@ TransitionEditorToolBar::TransitionEditorToolBar(QWidget *parent) : QToolBar(parent) , m_grp() { + setFixedHeight(Theme::toolbarSize()); setContentsMargins(0, 0, 0, 0); createLeftControls(); createCenterControls(); @@ -165,7 +166,7 @@ void TransitionEditorToolBar::createLeftControls() addSpacingToGroup(5); auto *settingsAction = createAction(TransitionEditorConstants::C_SETTINGS, - TimelineIcons::ANIMATION.icon(), + Theme::iconFromName(Theme::Icon::settings_medium), tr("Transition Settings"), QKeySequence(Qt::Key_S)); connect(settingsAction, @@ -206,7 +207,7 @@ void TransitionEditorToolBar::createCenterControls() addSpacing(10); auto *curvePicker = createAction(TransitionEditorConstants::C_CURVE_PICKER, - TimelineIcons::CURVE_EDITOR.icon(), + Theme::iconFromName(Theme::Icon::curveDesigner_medium), tr("Easing Curve Editor"), QKeySequence(Qt::Key_C)); @@ -236,7 +237,7 @@ void TransitionEditorToolBar::createRightControls() addSpacing(10); auto *zoomOut = createAction(TransitionEditorConstants::C_ZOOM_OUT, - TimelineIcons::ZOOM_SMALL.icon(), + Theme::iconFromName(Theme::Icon::zoomOut_medium), tr("Zoom Out"), QKeySequence(QKeySequence::ZoomOut)); @@ -261,7 +262,7 @@ void TransitionEditorToolBar::createRightControls() addSpacing(10); auto *zoomIn = createAction(TransitionEditorConstants::C_ZOOM_IN, - TimelineIcons::ZOOM_BIG.icon(), + Theme::iconFromName(Theme::Icon::zoomIn_medium), tr("Zoom In"), QKeySequence(QKeySequence::ZoomIn));