summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Joakim Bygdell <j.bygdell@gmail.com>2015-07-30 08:17:09 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-30 06:14:34 -0700
commit10e531d9072c9762df6c372c4a77309f4090c708 (patch)
treec5f5b6a54ea66c04672f94896a6ba9c33a8b3c27
parentd337def212acb6836ad93c2ec27625a19bfcdc61 (diff)
downloadsubsurface-10e531d9072c9762df6c372c4a77309f4090c708.tar.gz
QML UI: dynamic button sizes
Butons are sized based in the text printed on them, we want our buttons to have a meaningful minimum size and a preferred size that is similar regardless of screen resolution. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-mobile/DiveDetails.qml3
-rw-r--r--qt-mobile/main.qml4
2 files changed, 6 insertions, 1 deletions
diff --git a/qt-mobile/DiveDetails.qml b/qt-mobile/DiveDetails.qml
index 64b7398cc..6f8e83bfd 100644
--- a/qt-mobile/DiveDetails.qml
+++ b/qt-mobile/DiveDetails.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.2
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
+import QtQuick.Window 2.2
import org.subsurfacedivelog.mobile 1.0
Item {
@@ -44,10 +45,12 @@ Item {
Button {
id: backButton
Layout.margins: 0.1 * height
+ Layout.preferredWidth: Screen.width * 0.1
text: "\u2190"
style: ButtonStyle {
background: Rectangle {
color: "#4C68A2"
+ implicitWidth: 50
}
label: Text {
id: txt
diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml
index c782f1f3d..2cd1e5f8a 100644
--- a/qt-mobile/main.qml
+++ b/qt-mobile/main.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.2
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
+import QtQuick.Window 2.2
import org.subsurfacedivelog.mobile 1.0
ApplicationWindow {
@@ -85,9 +86,10 @@ ApplicationWindow {
id: prefsButton
text: "\u22ee"
anchors.right: parent.right
+ Layout.preferredWidth: Screen.width * 0.1
style: ButtonStyle {
background: Rectangle {
- implicitWidth: 72
+ implicitWidth: 50
color: "#2C4882"
}
label: Text {