summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2014-09-24 14:31:56 +0200
committerCaroline Chao <caroline.chao@digia.com>2014-09-24 13:43:56 +0200
commit25b1afcc1691d9a3d4c88be25a8919b317bc196b (patch)
tree20a14ff44c9a425cabf45c58b56254ebe7a263ae
parent0db918a6e8a93ad73fcfbe1a97b7239b7e40f27c (diff)
Fix back button on Android
+ Review home title height Change-Id: I21ae86625cc11358437294db90c9e8a1ffe638cc Reviewed-by: Niels Weber <niels.weber@digia.com>
-rw-r--r--qml/main.qml1
-rw-r--r--src/theme.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/qml/main.qml b/qml/main.qml
index 4bd1dcb..2553430 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -255,6 +255,7 @@ ApplicationWindow {
onRunningChanged: if (!running) {
splashscreen.opacity = 0
stack.push(Qt.resolvedUrl("components/HomeScreen.qml"))
+ stack.forceActiveFocus()
}
}
}
diff --git a/src/theme.cpp b/src/theme.cpp
index 8dbb74f..f36e21f 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -118,7 +118,7 @@ Theme::Theme(QObject *parent)
m_sizes->insert(QLatin1String("menuWidth"), QVariant(applyRatio(78)));
m_sizes->insert(QLatin1String("dayLabelHeight"), QVariant(applyRatio(70)));
m_sizes->insert(QLatin1String("upcomingEventHeight"), QVariant(applyRatio(130)));
- m_sizes->insert(QLatin1String("homeTitleHeight"), QVariant(applyRatio(100)));
+ m_sizes->insert(QLatin1String("homeTitleHeight"), QVariant(applyRatio(70)));
m_sizes->insert(QLatin1String("upcomingEventTimeWidth"), QVariant(applyRatio(240)));
m_sizes->insert(QLatin1String("trackFieldHeight"), QVariant(applyRatio(50)));
m_sizes->insert(QLatin1String("buttonHeight"), QVariant(applyRatio(130)));