feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Toolbars: various toolbar layout tweaks

Browse Source 
This makes sure that toolbutton sizes and spacings are correct in all
toolbar layout modes.

Task-number: QTCREATORBUG-29082
Change-Id: If2aad74b77c0b8dcda81478e3d345c783584cec4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2023-04-24 09:41:09 +02:00
parent 09a58ddd12
commit 4d2632c3fa
9 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -27,6 +27,7 @@
#include <QPainterPath>
#include <QPixmap>
#include <QPixmapCache>
#include <QScrollArea>
#include <QSpinBox>
#include <QStatusBar>
#include <QStyleFactory>
@@ -77,6 +78,9 @@ bool panelWidget(const QWidget *widget)
if (qobject_cast<const QTabBar *>(widget))
return styleEnabled(widget);
if (qobject_cast<const QScrollArea *>(widget))
return widget->property("panelwidget_singlerow").toBool(); // See DebuggerMainWindowPrivate
const QWidget *p = widget;
while (p) {
if (qobject_cast<const QToolBar *>(p) ||
@@ -667,10 +671,14 @@ void ManhattanStyle::polish(QWidget *widget)
} else if (qobject_cast<QLabel*>(widget) || qobject_cast<QSpinBox*>(widget)
|| qobject_cast<QCheckBox*>(widget)) {
widget->setPalette(panelPalette(widget->palette(), lightColored(widget)));
} else if (widget->property("panelwidget_singlerow").toBool()) {
} else if ((qobject_cast<QToolBar*>(widget) && !StyleHelper::isQDSTheme())
|| widget->property("panelwidget_singlerow").toBool()) {
widget->setFixedHeight(height);
} else if (qobject_cast<QStatusBar*>(widget)) {
widget->setFixedHeight(height + 2);
const bool flatAndNotCompact =
StyleHelper::toolbarStyle() != StyleHelper::ToolbarStyleCompact
&& creatorTheme()->flag(Theme::FlatToolBars);
widget->setFixedHeight(height + (flatAndNotCompact ? 3 : 2));
} else if (qobject_cast<QComboBox*>(widget)) {
const bool isLightColored = lightColored(widget);
QPalette palette = panelPalette(widget->palette(), isLightColored);
@@ -680,6 +688,9 @@ void ManhattanStyle::polish(QWidget *widget)
widget->setPalette(palette);
widget->setMaximumHeight(height - 2);
widget->setAttribute(Qt::WA_Hover);
} else if (qobject_cast<QScrollArea*>(widget)
&& widget->property("panelwidget_singlerow").toBool()) {
widget->setFixedHeight(height);
}
}
}