From 197c3e61fef0cc459df755efbe0fb4f4ebf0ef8c Mon Sep 17 00:00:00 2001 From: Wladimir Leuschner Date: Wed, 16 Oct 2024 16:33:35 +0200 Subject: [PATCH] QWindows11Style: Reduce textedit padding and align combobox texts Horizontal padding for textedit controls is reduced from 8px to 4px. To align the QComboBox label with the list flyout, the combobox label got additional 4px padding. Fixes: QTBUG-130125 Change-Id: Ieb4a8c9dab7fbe594134261b738060acfe7fdcb5 Reviewed-by: Oliver Wolff (cherry picked from commit c8fa7408a0c15054a6a50c28c0c21845134a4a13) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/styles/modernwindows/qwindows11style.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp index ff9a04ada23..3e139838461 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -1124,6 +1124,13 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op painter->save(); painter->setRenderHint(QPainter::Antialiasing); switch (element) { + case QStyle::CE_ComboBoxLabel: + if (const QStyleOptionComboBox *cb = qstyleoption_cast(option)) { + QStyleOptionComboBox newOption = *cb; + newOption.rect.adjust(4,0,-4,0); + QCommonStyle::drawControl(element, &newOption, painter,widget); + } + break; case QStyle::CE_TabBarTabShape: if (const QStyleOptionTab *tab = qstyleoption_cast(option)) { QRectF tabRect = tab->rect.marginsRemoved(QMargins(2,2,0,0)); @@ -1781,7 +1788,7 @@ QRect QWindows11Style::subElementRect(QStyle::SubElement element, const QStyleOp QRect ret; switch (element) { case QStyle::SE_LineEditContents: - ret = option->rect.adjusted(8,0,-8,0); + ret = option->rect.adjusted(4,0,-4,0); break; case QStyle::SE_ItemViewItemText: if (const auto *item = qstyleoption_cast(option)) {