aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-06-26 12:49:34 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-06-26 11:37:16 +0000
commitf31da34faf08d18f83bd36cfcf5c44dc7019f529 (patch)
tree0623023df07fd4be752b99658c2be2f951650025
parent33ce8219fd1a6c26e4918012cd00376c386497c2 (diff)
Native style: support checkable buttons
Change-Id: Id80add4e7c3611f9a12695745300d335a015cb43 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--examples/quickcontrols2/desktopgallery/Buttons.qml5
-rw-r--r--src/imports/nativestyle/items/qquickstyleitembutton.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/quickcontrols2/desktopgallery/Buttons.qml b/examples/quickcontrols2/desktopgallery/Buttons.qml
index 286cd627..2a11dea3 100644
--- a/examples/quickcontrols2/desktopgallery/Buttons.qml
+++ b/examples/quickcontrols2/desktopgallery/Buttons.qml
@@ -91,5 +91,10 @@ ControlContainer {
text: "Flat"
flat: true
}
+
+ Button {
+ text: "Checkable"
+ checkable: true
+ }
}
}
diff --git a/src/imports/nativestyle/items/qquickstyleitembutton.cpp b/src/imports/nativestyle/items/qquickstyleitembutton.cpp
index 6f3fbfec..8e45cc69 100644
--- a/src/imports/nativestyle/items/qquickstyleitembutton.cpp
+++ b/src/imports/nativestyle/items/qquickstyleitembutton.cpp
@@ -80,7 +80,7 @@ void QQuickStyleItemButton::initStyleOption(QStyleOptionButton &styleOption)
styleOption.state |= QStyle::State_Sunken;
if (!button->isFlat() && !button->isDown())
styleOption.state |= QStyle::State_Raised;
- if (button->isHighlighted())
+ if (button->isHighlighted() || button->isChecked())
styleOption.state |= QStyle::State_On;
if (button->isFlat())
styleOption.features |= QStyleOptionButton::Flat;