summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2018-12-16 21:39:04 -0500
committerScott Murray <scott.murray@konsulko.com>2018-12-18 01:26:55 +0000
commit082863ed552455fd6d04e2141ecf415559a7a861 (patch)
tree5257afdd258616fa46243c8465b8250021e0ac2d
parentfba3f8d5a8c5966ab73db999a2476cf6534c1245 (diff)
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 <scott.murray@konsulko.com> (cherry picked from commit b3dcdb893234873325cdb121c8eda634f97a4c31)
-rw-r--r--app/bluetooth/Bluetooth.qml9
1 files 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
}