diff options
| -rw-r--r-- | src/imports/controls/TextArea.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/TextField.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/Tumbler.qml | 1 | ||||
| -rw-r--r-- | tests/manual/fonts/main.qml | 58 |
4 files changed, 41 insertions, 20 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 0ce489ff..fcbe52a7 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -52,6 +52,7 @@ T.TextArea { width: control.availableWidth height: control.availableHeight + font: control.font color: control.Theme.disabledColor visible: !control.length } diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 98baebbc..6437a1de 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -55,6 +55,7 @@ T.TextField { width: control.width - (control.leftPadding + control.rightPadding) height: control.height - (control.topPadding + control.bottomPadding) + font: control.font color: control.Theme.disabledColor visible: !control.displayText elide: Text.ElideRight diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index feacb721..36c84cdb 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -48,6 +48,7 @@ T.Tumbler { id: label text: modelData color: "#666666" + font: control.font opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 11298660..d7c16ab0 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -49,27 +49,45 @@ ApplicationWindow { height: 640 title: qsTr("Hello World") - T.Control { - id: control - ColumnLayout { - Button { text: "Button" } - CheckBox { text: "CheckBox" } - GroupBox { title: "GroupBox" } - RadioButton { text: "RadioButton" } - Switch { text: "Switch" } - TabButton { - text: "TabButton" - font.pointSize: control.font.pointSize - } - ToggleButton { text: "ToggleButton" } - ToolButton { text: "ToolButton" } - Slider { - from: 16 - to: 48 - stepSize: 1 - onValueChanged: control.font.pointSize = value + header: ToolBar { + Slider { + from: 16 + to: 48 + stepSize: 1 + onValueChanged: control.font.pointSize = value + } + } + + Flickable { + anchors.fill: parent + contentWidth: control.width + contentHeight: control.height + + T.Control { + id: control + width: layout.implicitWidth + 40 + height: layout.implicitHeight + 40 + ColumnLayout { + id: layout + anchors.fill: parent + anchors.margins: 20 + Button { text: "Button" } + CheckBox { text: "CheckBox" } + GroupBox { title: "GroupBox" } + RadioButton { text: "RadioButton" } + Switch { text: "Switch" } + TabButton { + text: "TabButton" + font.pointSize: control.font.pointSize + } + TextField { placeholder.text: "TextField" } + TextArea { placeholder.text: "TextArea" } + ToggleButton { text: "ToggleButton" } + ToolButton { text: "ToolButton" } + Tumbler { model: 3 } } } + + T.ScrollBar.vertical: ScrollBar { } } } - |