diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-24 23:54:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-25 10:36:36 +0000 |
| commit | d5408fe6c01dd9a3c5e9b943db5abda755df0b12 (patch) | |
| tree | 5ecb6caafada917fe043d223d7f3bc6a94b82d83 /tests/manual/fonts | |
| parent | 8ccc9780c8ab46f69df0c75ae2b4bdc4cb6b018b (diff) | |
Fix Tumbler font, and TextField & TextArea placeholder fonts
Change-Id: Ifbc8e0a221b1190becb789d69b9b313ab45e1615
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/manual/fonts')
| -rw-r--r-- | tests/manual/fonts/main.qml | 58 |
1 files changed, 38 insertions, 20 deletions
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 { } } } - |