From 09a56c4fe9999b5e1ab8921d37ae8f9a000f6ad6 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Sun, 9 Nov 2014 13:10:50 +0100
Subject: [PATCH] Android/SwitchStyle: hide thumb text on Android 5.0
Change-Id: Ied63a5bd58a88f097ac9e20f30c21d45f45a2f46
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
---
src/controls/Styles/Android/SwitchStyle.qml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/controls/Styles/Android/SwitchStyle.qml b/src/controls/Styles/Android/SwitchStyle.qml
index 8401d3535..6e9260c35 100644
--- a/src/controls/Styles/Android/SwitchStyle.qml
+++ b/src/controls/Styles/Android/SwitchStyle.qml
@@ -79,6 +79,8 @@ SwitchStyle {
Item {
id: thumb
+ readonly property bool hideText: AndroidStyle.styleDef.switchStyle.Switch_showText === false
+
x: control.checked ? max : min
TextMetrics {
@@ -126,6 +128,7 @@ SwitchStyle {
LabelStyle {
id: label
+ visible: !thumb.hideText
text: control.checked ? panel.styleDef.Switch_textOn : panel.styleDef.Switch_textOff
pressed: control.pressed
--
GitLab