summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-08-05 18:07:17 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-08-12 17:22:04 +0200
commitc50dfe465ae98df0f5a1cbe696dab1c02d665ed0 (patch)
tree1816ea4aca885bb6c8d0c87f1e0708e963086d38 /src
parentce59aa5b8c402fe443d6b993928b4c795f1b0f00 (diff)
Fix minor issues with HomeScreen transitions
Diffstat (limited to 'src')
-rw-r--r--src/qml/HomeScreen.qml23
1 files changed, 17 insertions, 6 deletions
diff --git a/src/qml/HomeScreen.qml b/src/qml/HomeScreen.qml
index 7ef446e..793589e 100644
--- a/src/qml/HomeScreen.qml
+++ b/src/qml/HomeScreen.qml
@@ -93,6 +93,10 @@ Rectangle {
states: [
State {
name: "enabled"
+ PropertyChanges {
+ target: tabView
+ interactive: false
+ }
AnchorChanges {
target: homeScreen
anchors.top: navigation.bottom
@@ -107,6 +111,10 @@ Rectangle {
},
State {
name: "edit"
+ PropertyChanges {
+ target: tabView
+ interactive: false
+ }
}
]
@@ -453,20 +461,24 @@ Rectangle {
Rectangle {
id: error
visible: messageBox.state != "empty"
+ height: childrenRect.height
anchors {
top: parent.top
left: parent.left
right: parent.right
+ topMargin: 50
}
- height: homeScreen.height / 2
Image {
id: errorIcon
source: "qrc:///error"
- anchors.centerIn: parent
+ anchors {
+ horizontalCenter: parent.horizontalCenter
+ top: parent.top
+ }
}
Text {
anchors {
- topMargin: 10
+ topMargin: 30
top: errorIcon.bottom
horizontalCenter: parent.horizontalCenter
}
@@ -486,15 +498,14 @@ Rectangle {
color: iconOverlayColor
font.family: defaultFontFamily
font.pixelSize: 28
- verticalAlignment: Text.AlignVCenter
+ verticalAlignment: Text.AlignTop
horizontalAlignment: Text.AlignHCenter
}
Rectangle {
- height: 2 * toolBarSize
anchors {
- bottom: parent.bottom
top: message.bottom
+ bottom: parent.bottom
left: parent.left
right: parent.right
bottomMargin: 70