From 1549f5818cdcbb82f59aad7eb02b91373d5168c4 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 30 Apr 2020 17:45:48 +0200 Subject: [PATCH] QmlDesigner: Move designer action to the center of the tool bar Change-Id: I7d6b38ea31ebefe0c01acd9360271fc5ba062ffe Reviewed-by: Tim Jenssen --- .../components/componentcore/designeractionmanager.cpp | 4 ++++ src/plugins/qmldesigner/designmodewidget.cpp | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index cf3fb5e1524..95b11c15afe 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -1212,6 +1212,10 @@ void DesignerActionManager::addTransitionEffectAction(const TypeName &typeName) DesignerActionToolBar::DesignerActionToolBar(QWidget *parentWidget) : Utils::StyledBar(parentWidget), m_toolBar(new QToolBar("ActionToolBar", this)) { + QWidget* empty = new QWidget(); + empty->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + m_toolBar->addWidget(empty); + m_toolBar->setContentsMargins(0, 0, 0, 0); m_toolBar->setFloatable(true); m_toolBar->setMovable(true); diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 9bc485fd906..2cf61e6e207 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -212,6 +212,13 @@ void DesignModeWidget::disableWidgets() m_isDisabled = true; } +static void addSpacerToToolBar(QToolBar *toolBar) +{ + QWidget* empty = new QWidget(); + empty->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + toolBar->addWidget(empty); +} + void DesignModeWidget::setup() { auto &actionManager = viewManager().designerActionManager(); @@ -366,6 +373,7 @@ void DesignModeWidget::setup() // Create toolbars auto toolBar = new QToolBar(); + toolBar->addAction(viewManager().componentViewAction()); toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); DesignerActionToolBar *designerToolBar = QmlDesignerPlugin::instance()->viewManager().designerActionManager().createToolBar(m_toolBar); @@ -407,6 +415,8 @@ void DesignModeWidget::setup() } }); + addSpacerToToolBar(toolBar); + auto workspaceComboBox = new QComboBox(); workspaceComboBox->setMinimumWidth(120); workspaceComboBox->setToolTip(tr("Switch the active workspace."));