summaryrefslogtreecommitdiffstats
path: root/src/controls/Styles/iOS
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/Styles/iOS')
-rw-r--r--src/controls/Styles/iOS/ComboBoxStyle.qml6
-rw-r--r--src/controls/Styles/iOS/CursorHandleStyle.qml1
-rw-r--r--src/controls/Styles/iOS/SpinBoxStyle.qml6
-rw-r--r--src/controls/Styles/iOS/TextAreaStyle.qml6
-rw-r--r--src/controls/Styles/iOS/TextFieldStyle.qml6
-rw-r--r--src/controls/Styles/iOS/ToolButtonStyle.qml1
6 files changed, 14 insertions, 12 deletions
diff --git a/src/controls/Styles/iOS/ComboBoxStyle.qml b/src/controls/Styles/iOS/ComboBoxStyle.qml
index 147fd7fdb..ba657298e 100644
--- a/src/controls/Styles/iOS/ComboBoxStyle.qml
+++ b/src/controls/Styles/iOS/ComboBoxStyle.qml
@@ -42,7 +42,7 @@ import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.3
ComboBoxStyle {
- selectionHandle: SelectionHandleStyle{}
- cursorHandle: CursorHandleStyle{}
- cursorDelegate: CursorDelegate{}
+ __selectionHandle: SelectionHandleStyle{}
+ __cursorHandle: CursorHandleStyle{}
+ __cursorDelegate: CursorDelegate{}
}
diff --git a/src/controls/Styles/iOS/CursorHandleStyle.qml b/src/controls/Styles/iOS/CursorHandleStyle.qml
index 26ab97282..408a7bf46 100644
--- a/src/controls/Styles/iOS/CursorHandleStyle.qml
+++ b/src/controls/Styles/iOS/CursorHandleStyle.qml
@@ -45,6 +45,7 @@ Item {
y: -20
width: 80
height: knob.height + knobLine.height + 60
+ visible: styleData.hasSelection
Rectangle {
id: knob
diff --git a/src/controls/Styles/iOS/SpinBoxStyle.qml b/src/controls/Styles/iOS/SpinBoxStyle.qml
index a764cb79d..c898e5e9f 100644
--- a/src/controls/Styles/iOS/SpinBoxStyle.qml
+++ b/src/controls/Styles/iOS/SpinBoxStyle.qml
@@ -42,7 +42,7 @@ import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.3
SpinBoxStyle {
- selectionHandle: SelectionHandleStyle{}
- cursorHandle: CursorHandleStyle{}
- cursorDelegate: CursorDelegate{}
+ __selectionHandle: SelectionHandleStyle{}
+ __cursorHandle: CursorHandleStyle{}
+ __cursorDelegate: CursorDelegate{}
}
diff --git a/src/controls/Styles/iOS/TextAreaStyle.qml b/src/controls/Styles/iOS/TextAreaStyle.qml
index 6b8a18003..6be12be68 100644
--- a/src/controls/Styles/iOS/TextAreaStyle.qml
+++ b/src/controls/Styles/iOS/TextAreaStyle.qml
@@ -51,7 +51,7 @@ ScrollViewStyle {
property color selectedTextColor: SystemPaletteSingleton.highlightedText(control.enabled)
property color backgroundColor: control.backgroundVisible ? SystemPaletteSingleton.base(control.enabled) : "transparent"
property int renderType: Text.QtRendering
- property Component selectionHandle: SelectionHandleStyle{}
- property Component cursorHandle: CursorHandleStyle{}
- property Component cursorDelegate: CursorDelegate{}
+ property Component __selectionHandle: SelectionHandleStyle{}
+ property Component __cursorHandle: CursorHandleStyle{}
+ property Component __cursorDelegate: CursorDelegate{}
}
diff --git a/src/controls/Styles/iOS/TextFieldStyle.qml b/src/controls/Styles/iOS/TextFieldStyle.qml
index 28ad692ff..ca237a0a2 100644
--- a/src/controls/Styles/iOS/TextFieldStyle.qml
+++ b/src/controls/Styles/iOS/TextFieldStyle.qml
@@ -42,7 +42,7 @@ import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.3
TextFieldStyle {
- selectionHandle: SelectionHandleStyle{}
- cursorHandle: CursorHandleStyle{}
- cursorDelegate: CursorDelegate{}
+ __selectionHandle: SelectionHandleStyle{}
+ __cursorHandle: CursorHandleStyle{}
+ __cursorDelegate: CursorDelegate{}
}
diff --git a/src/controls/Styles/iOS/ToolButtonStyle.qml b/src/controls/Styles/iOS/ToolButtonStyle.qml
index c2d2db9c3..3e4cbd2e5 100644
--- a/src/controls/Styles/iOS/ToolButtonStyle.qml
+++ b/src/controls/Styles/iOS/ToolButtonStyle.qml
@@ -38,5 +38,6 @@
**
****************************************************************************/
import QtQuick.Controls.Styles 1.3
+import QtQuick.Controls.Private 1.0
ToolButtonStyle { }