diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2023-02-24 17:41:36 +0100 |
|---|---|---|
| committer | Henning Gründl <henning.gruendl@qt.io> | 2023-02-27 09:32:07 +0000 |
| commit | fcd286acfcde2368867318d6f0261d4c5c41b034 (patch) | |
| tree | e9be5e0468bbc33b3941c8e26f869ab40b7eadfc | |
| parent | f8911f56fcd4575fd4f78dcdcb02d49207c6c978 (diff) | |
| download | qt-creator-fcd286acfcde2368867318d6f0261d4c5c41b034.tar.gz | |
QmlDesigner: Fix 2d/3d editor tool bar color macOS
Change-Id: Iab57fd51b962bcb174c4d004e4cfed1500bb4e74
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
(cherry picked from commit f61266b829c6960a5e427002586f85d1733f5581)
| -rw-r--r-- | src/plugins/qmldesigner/components/formeditor/toolbox.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index 3dbb9c6806..1eab86ed0d 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); |