diff options
author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-01-01 17:05:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-01 17:24:23 +0100 |
commit | c5caab0666bbd9ff5261e7b783b77a483ae736ed (patch) | |
tree | 8dd191bfeac6c8ae983cb0235e2aed4ce2232a01 /tests/manual | |
parent | 601ee60aed7bdd82625b410ab45289e8a49b9d39 (diff) | |
download | qtquickcontrols-c5caab0666bbd9ff5261e7b783b77a483ae736ed.tar.gz |
Improved stretching behavior
This improves at least combobox, slider and button to behave
more consistent while being stretched.
Change-Id: Ie476d5a44de14580699acc0defd35aef7dbd8297
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/stretching.qml | 81 | ||||
-rw-r--r-- | tests/manual/stretchingcustom.qml | 81 |
2 files changed, 162 insertions, 0 deletions
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml new file mode 100644 index 00000000..5d9290e9 --- /dev/null +++ b/tests/manual/stretching.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Components project. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDesktop 1.0 +import QtDesktop.Styles 1.0 + +Rectangle { + width: 600 + height: 400 + + TabFrame { + anchors.fill: parent + Tab { + title: "Height" + Row { + height: parent.height + anchors.horizontalCenter: parent.horizontalCenter + Button { text: "One" ; height: parent.height} + Slider { height: parent.height} + ComboBox { height: parent.height} + } + } + Tab { + title: "Width" + Column { + width: parent.width + anchors.verticalCenter: parent.verticalCenter + Button { text: "One" ; width: parent.width} + Slider { width: parent.width} + ComboBox {width: parent.width} + } + } + Tab { + title: "Both" + Row { + anchors.fill: parent + Button { text: "One" ; width: parent.width/3 ; height: parent.height} + Slider { width: parent.width/3 ; height: parent.height} + ComboBox {width: parent.width/3 ; height: parent.height} + } + } + } +} diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml new file mode 100644 index 00000000..81b4d474 --- /dev/null +++ b/tests/manual/stretchingcustom.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Components project. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDesktop 1.0 +import QtDesktop.Styles 1.0 + +Rectangle { + width: 600 + height: 400 + + TabFrame { + anchors.fill: parent + Tab { + title: "Height" + Row { + height: parent.height + anchors.horizontalCenter: parent.horizontalCenter + Button { text: "One" ; height: parent.height; style: ButtonStyle{}} + Slider { height: parent.height ; style: SliderStyle{}} + ComboBox { height: parent.height ; style: ComboBoxStyle{}} + } + } + Tab { + title: "Width" + Column { + width: parent.width + anchors.verticalCenter: parent.verticalCenter + Button { text: "One" ; width: parent.width; style: ButtonStyle{}} + Slider { width: parent.width ; style: SliderStyle{}} + ComboBox {width: parent.width ; style: ComboBoxStyle{}} + } + } + Tab { + title: "Both" + Row { + anchors.fill: parent + Button { text: "One" ; width: parent.width/3 ; height: parent.height; style: ButtonStyle{}} + Slider { width: parent.width/3 ; height: parent.height ; style: SliderStyle{}} + ComboBox {width: parent.width/3 ; height: parent.height ; style: ComboBoxStyle{}} + } + } + } +} |