Commit d0eadc7b authored by J-P Nurmi's avatar J-P Nurmi Committed by The Qt Project
Browse files

ButtonStyle: expose styleData.hovered


Change-Id: I8f977a171ea18420e326b79181d634eeb43b1de8
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent 2f2933a2
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 30 additions and 16 deletions
......@@ -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
}
}
......
......@@ -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
}
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment