From d0eadc7b164d2f00cd19885907d57a4e1aa02d4b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Mon, 27 May 2013 19:57:46 +0200
Subject: [PATCH] ButtonStyle: expose styleData.hovered
Change-Id: I8f977a171ea18420e326b79181d634eeb43b1de8
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
.../quick/controls/gallery/content/Styles.qml | 24 ++++++++-----------
src/styles/Base/ButtonStyle.qml | 22 +++++++++++++++--
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/examples/quick/controls/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml
index a65f30242..01b2646f4 100644
--- a/examples/quick/controls/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
@@ -172,17 +172,13 @@ Item {
// Style delegates:
property Component buttonStyle: ButtonStyle {
- panel: Rectangle {
+ background: Rectangle {
implicitHeight: 20
implicitWidth: 100
color: control.pressed ? "darkGray" : "lightGray"
antialiasing: true
border.color: "gray"
radius: height/2
- Text {
- anchors.centerIn: parent
- text: control.text
- }
}
}
@@ -220,21 +216,21 @@ Item {
}
property Component progressbarStyle: ProgressBarStyle {
- panel: Rectangle {
+ background: Rectangle {
implicitWidth: 100
implicitHeight: 20
color: "#f0f0f0"
border.color: "gray"
antialiasing: true
radius: height/2
- Rectangle {
- implicitWidth: 100
- implicitHeight: 20
- color: "#f0f0f0"
- border.color: "gray"
- antialiasing: true
- radius: height/2
- }
+ }
+ progress: Rectangle {
+ implicitWidth: 100
+ implicitHeight: 20
+ color: "#c0c0c0"
+ border.color: "gray"
+ antialiasing: true
+ radius: height/2
}
}
diff --git a/src/styles/Base/ButtonStyle.qml b/src/styles/Base/ButtonStyle.qml
index a524d93f4..e668b0422 100644
--- a/src/styles/Base/ButtonStyle.qml
+++ b/src/styles/Base/ButtonStyle.qml
@@ -92,7 +92,13 @@ PaddedStyle {
bottom: 4
}
- /*! The background of the button. */
+ /*! This defines the background of the button. In addition to the public
+ properties of \c control, the following state properties are available:
+
+ \table
+ \li readonly property bool styleData.hovered - The button is currently hovered.
+ \endtable
+ */
property Component background: Item {
implicitWidth: 100
implicitHeight: 25
@@ -129,7 +135,13 @@ PaddedStyle {
}
}
- /*! The label of the button. */
+ /*! This defines the label of the button. In addition to the public
+ properties of \c control, the following state properties are available:
+
+ \table
+ \li readonly property bool styleData.hovered - The button is currently hovered.
+ \endtable
+ */
property Component label: Text {
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
@@ -149,6 +161,9 @@ PaddedStyle {
id: backgroundLoader
anchors.fill: parent
sourceComponent: background
+ property QtObject styleData: QtObject {
+ readonly property bool hovered: control.__containsMouse
+ }
}
Loader {
@@ -159,6 +174,9 @@ PaddedStyle {
anchors.topMargin: padding.top
anchors.rightMargin: padding.right
anchors.bottomMargin: padding.bottom
+ property QtObject styleData: QtObject {
+ readonly property bool hovered: control.__containsMouse
+ }
}
}
}
--
GitLab