From 503f9aa9348b47c4a73f52a3744d901c2be02135 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 9 Feb 2015 15:16:08 -0800 Subject: [PATCH] Rework setup button to fit in lower resolution displays --- src/QmlControls/SetupButton.qml | 6 +++--- src/VehicleSetup/SetupView.ui | 4 ++-- src/VehicleSetup/SetupViewButtons.qml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/QmlControls/SetupButton.qml b/src/QmlControls/SetupButton.qml index cefc33421..ba2f03f1a 100644 --- a/src/QmlControls/SetupButton.qml +++ b/src/QmlControls/SetupButton.qml @@ -7,7 +7,7 @@ import QGroundControl.Palette 1.0 Button { checkable: true - height: 80 + height: 60 text: "Button" property bool setupComplete: true @@ -22,7 +22,7 @@ Button { background: Rectangle { id: innerRect - readonly property real titleHeight: 30 + readonly property real titleHeight: 20 border.color: control.checked ? "#eee333" : "#676767" radius: 10 @@ -45,7 +45,7 @@ Button { Rectangle { id: setupIndicator - readonly property real indicatorRadius: 6 + readonly property real indicatorRadius: 4 x: parent.width - (indicatorRadius * 2) - 5 y: (parent.height - (indicatorRadius * 2)) / 2 diff --git a/src/VehicleSetup/SetupView.ui b/src/VehicleSetup/SetupView.ui index d5bc228c6..074686aa8 100644 --- a/src/VehicleSetup/SetupView.ui +++ b/src/VehicleSetup/SetupView.ui @@ -24,13 +24,13 @@ - 160 + 120 0 - 160 + 120 16777215 diff --git a/src/VehicleSetup/SetupViewButtons.qml b/src/VehicleSetup/SetupViewButtons.qml index b0e1e3066..f72b1c773 100644 --- a/src/VehicleSetup/SetupViewButtons.qml +++ b/src/VehicleSetup/SetupViewButtons.qml @@ -46,7 +46,7 @@ Rectangle { SetupButton { id: summaryButton; objectName: "summaryButton" width: parent.width - text: "VEHICLE SUMMARY" + text: "SUMMARY" setupIndicator: false exclusiveGroup: setupButtonGroup onClicked: topLevel.summaryButtonClicked() -- 2.22.0