From fcd286acfcde2368867318d6f0261d4c5c41b034 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Fri, 24 Feb 2023 17:41:36 +0100 Subject: [PATCH] QmlDesigner: Fix 2d/3d editor tool bar color macOS Change-Id: Iab57fd51b962bcb174c4d004e4cfed1500bb4e74 Reviewed-by: Thomas Hartmann Reviewed-by: (cherry picked from commit f61266b829c6960a5e427002586f85d1733f5581) --- .../qmldesigner/components/formeditor/toolbox.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index 3dbb9c6806f..1eab86ed0d6 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp @@ -20,27 +20,23 @@ ToolBox::ToolBox(QWidget *parentWidget) { setProperty("panelwidget", false); - QPalette pal = palette(); - pal.setColor(QPalette::Window, Theme::getColor(Theme::DStoolbarBackground)); - setAutoFillBackground(true); - setPalette(pal); - m_leftToolBar->setFloatable(true); m_leftToolBar->setMovable(true); m_leftToolBar->setOrientation(Qt::Horizontal); auto horizontalLayout = new QHBoxLayout(this); - horizontalLayout->setContentsMargins(9, 5, 9, 5); + horizontalLayout->setContentsMargins(0, 0, 0, 0); horizontalLayout->setSpacing(0); setFixedHeight(Theme::toolbarSize()); - m_leftToolBar->setProperty("panelwidget", false); m_leftToolBar->setProperty("panelwidget_singlerow", false); + m_leftToolBar->setFixedHeight(Theme::toolbarSize()); m_rightToolBar->setProperty("panelwidget", false); m_rightToolBar->setProperty("panelwidget_singlerow", false); + m_rightToolBar->setFixedHeight(Theme::toolbarSize()); m_rightToolBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding); auto stretchToolbar = new QToolBar(this);