From 082863ed552455fd6d04e2141ecf415559a7a861 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 16 Dec 2018 21:39:04 -0500 Subject: Fix a couple of UI issues Tweak the scan button anchoring so it renders reliably, the mix of anchoring and forward referenced values seemed to be causing it to misrender. As well, make it and the detected list visibility dependent on Bluetooth being enabled for consistency. Change-Id: Ib13b206c74234e5618f14277097259b848d62a58 Signed-off-by: Scott Murray (cherry picked from commit b3dcdb893234873325cdb121c8eda634f97a4c31) --- app/bluetooth/Bluetooth.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml index 00c0e37..8eb7cd6 100644 --- a/app/bluetooth/Bluetooth.qml +++ b/app/bluetooth/Bluetooth.qml @@ -139,16 +139,16 @@ SettingPage { anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom anchors.margins: 80 - width: buttonScan.width + 10 - height: buttonScan.height + 10 + width: 110 color: "#222" border.color: "white" Button { id: buttonScan anchors.centerIn: parent - width: 100 + anchors.margins: 10 text: bluetooth.discoverable ? "STOP" :"SEARCH" + visible: bluetooth.power MouseArea { //id: mouseArea @@ -283,7 +283,7 @@ SettingPage { anchors.bottom: pairedlabel.bottom anchors.bottomMargin: (-120*pairedDeviceCount) model: pairedDeviceList - visible: bluetooth.power + visible: bluetooth.power delegate: blueToothDevice clip: true } @@ -318,6 +318,7 @@ SettingPage { anchors.bottom: parent.bottom anchors.bottomMargin: 150 model: btDeviceList + visible: bluetooth.power delegate: blueToothDevice clip: true } -- cgit 1.2.3-korg