diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-05-03 15:54:57 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-05-16 20:32:27 +0200 |
| commit | 1c338e6d07a42631a6603c5bb0bc86f6806addd6 (patch) | |
| tree | de4596c3990bac4029c9c916d93504c64249f66c /tests | |
| parent | 8af70190966e38dc3a697859f427276aecfe44d4 (diff) | |
Stylesheet: fix toolbutton menu indicator rendering
Turn off native indicators if we have custom rules, and if we drew
natively, don't draw custom indicators. This amends
ea0e0a865237983b484ed88447b9fc4c473e2759 which turned off custom drawing
too aggressively, removing custom indicators also if no custom drop
down arrow (which is only relevant for drop down menu buttons) was set.
When then drawing the custom indicator, respect positioning rules in the
style sheet.
Extend baseline test.
Fixes: QTBUG-102866
Pick-to: 6.3 6.2
Change-Id: I5ca353f42e704ec3f6e57677c35118a9cb358b0b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/baseline/stylesheet/qss/qtoolbutton/menuButton_subcontrol_position.qss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/baseline/stylesheet/qss/qtoolbutton/menuButton_subcontrol_position.qss b/tests/baseline/stylesheet/qss/qtoolbutton/menuButton_subcontrol_position.qss new file mode 100644 index 0000000000..4a1a5f0c23 --- /dev/null +++ b/tests/baseline/stylesheet/qss/qtoolbutton/menuButton_subcontrol_position.qss @@ -0,0 +1,4 @@ +QToolButton::menu-indicator { + subcontrol-position: right center; + subcontrol-origin: padding; +} |