diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
| commit | d2628d9d7015e4b75007471d150acedecaa0c6c1 (patch) | |
| tree | 00ab012c7ae190d5a64788ee945ca006e3759e41 /examples/quick/shared | |
| parent | b6a6a6387e279c431d520243345530fa19bd96c5 (diff) | |
| parent | 566afc2d2e4156712ffec081715f12307cf46628 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
Diffstat (limited to 'examples/quick/shared')
| -rw-r--r-- | examples/quick/shared/Button.qml | 7 | ||||
| -rw-r--r-- | examples/quick/shared/TabSet.qml | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/examples/quick/shared/Button.qml b/examples/quick/shared/Button.qml index 551f7d6e04..468f945934 100644 --- a/examples/quick/shared/Button.qml +++ b/examples/quick/shared/Button.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 +import QtQuick.Window 2.1 Item { id: container @@ -48,8 +49,8 @@ Item { signal clicked property alias containsMouse: mouseArea.containsMouse property alias pressed: mouseArea.pressed - implicitHeight: buttonLabel.implicitHeight * 1.2 - implicitWidth: buttonLabel.implicitWidth * 1.2 + implicitHeight: Math.max(Screen.logicalPixelDensity * 7, buttonLabel.implicitHeight * 1.2) + implicitWidth: Math.max(Screen.logicalPixelDensity * 11, buttonLabel.implicitWidth * 1.3) height: implicitHeight width: implicitWidth @@ -64,7 +65,7 @@ Item { GradientStop { position: 1.0; color: Qt.darker(palette.button, 1.3) } } antialiasing: true - radius: height / 4 + radius: height / 6 border.color: Qt.darker(palette.button, 1.5) border.width: 1 } diff --git a/examples/quick/shared/TabSet.qml b/examples/quick/shared/TabSet.qml index 10263a70ac..86050b6073 100644 --- a/examples/quick/shared/TabSet.qml +++ b/examples/quick/shared/TabSet.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Window 2.1 Item { id: tabWidget @@ -65,7 +66,8 @@ Item { Repeater { model: stack.children.length delegate: Rectangle { - width: tabWidget.width / stack.children.length; height: 36 + width: tabWidget.width / stack.children.length + height: Math.max(Screen.logicalPixelDensity * 11, label.implicitHeight * 1.2) Rectangle { width: parent.width; height: 1 @@ -79,6 +81,7 @@ Item { visible: tabWidget.current == index } Text { + id: label horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter anchors.fill: parent text: stack.children[index].title |