summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-12-22 13:44:44 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2016-12-22 13:44:44 +0000
commitae24499acd55d7d5af513061d9aa2e56b8a99f83 (patch)
treee156dc20b856634aea2049d9bf0764c9f90835f5
parent39892431d66f8bf95070a24de23e6b24ff1d73fd (diff)
parent58e7c5ae5882d1613635c2b0940531988f48c410 (diff)
Merge "Wifi: Fix layout"
-rw-r--r--app/wifi/Wifi.qml16
1 files changed, 5 insertions, 11 deletions
diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml
index cc58055..43e32b7 100644
--- a/app/wifi/Wifi.qml
+++ b/app/wifi/Wifi.qml
@@ -76,12 +76,10 @@ SettingPage {
id: wifiDevice
Rectangle {
height: 120
- width: parent.width
+ width: ListView.view.width
color: "transparent"
Image {
-
anchors.left: parent.left
- anchors.leftMargin: 80
//width: 70
//height: 50
id: icon
@@ -110,14 +108,14 @@ SettingPage {
Column {
anchors.left: icon.right
anchors.leftMargin: 5
- Text {
+ Label {
id: networkNameText
text: name
color: '#66FF99'
font.pixelSize: 48
font.bold: serviceState === "ready" || serviceState === "online"
}
- Text {
+ Label {
visible: serviceState === "ready" || serviceState === "online"
text: "connected, " + address
font.pointSize: 18
@@ -130,7 +128,6 @@ SettingPage {
anchors.top: parent.top
anchors.topMargin: 5
//anchors.horizontalCenter: networkNameText.horizontalCenter
- anchors.rightMargin: 50
anchors.right: parent.right
width: 250
@@ -280,11 +277,8 @@ SettingPage {
}
ListView {
- width: parent.width
- anchors.top: parent.top
- anchors.topMargin: 70
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 150
+ anchors.fill: parent
+ anchors.margins: 100
model: networkList //WifiList {}
delegate: wifiDevice
clip: true