git.iko.soy/unity8
on xenial help sign in
Fixed indicator spacing
ca52a04Nick Dedekind
Panel/Indicators/DefaultIndicatorWidget.qml+1−1
compare with xenial
unifiedsplit
@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators
24Indicators.IndicatorWidget {
24Indicators.IndicatorWidget {
25 id: indicatorWidget
25 id: indicatorWidget
26
26
27− width: itemRow.width + units.gu(1)
27+ width: itemRow.width + units.gu(0.7)
28
28
29 property alias label: itemLabel.text
29 property alias label: itemLabel.text
30 property alias iconSource: itemImage.source
30 property alias iconSource: itemImage.source
Panel/Indicators/DefaultIndicatorWidget2.qml+15−14
@@ -24,7 +24,7 @@ import Unity.Indicators 0.1 as Indicators
24Indicators.IndicatorWidget {
24Indicators.IndicatorWidget {
25 id: indicatorWidget
25 id: indicatorWidget
26
26
27− width: itemRow.width + units.gu(1)
27+ width: itemRow.width + units.gu(0.7)
28
28
29 property alias label: itemLabel.text
29 property alias label: itemLabel.text
30 property var icons: undefined
30 property var icons: undefined
@@ -39,28 +39,29 @@ Indicators.IndicatorWidget {
39 }
39 }
40 spacing: units.gu(0.5)
40 spacing: units.gu(0.5)
41
41
42− Repeater {
42+ Row {
43− model: indicatorWidget.icons
44 width: childrenRect.width
43 width: childrenRect.width
45 anchors {
44 anchors {
46 top: parent.top
45 top: parent.top
47 bottom: parent.bottom
46 bottom: parent.bottom
48 }
47 }
48+ spacing: units.gu(0.7)
49
49
50+ Repeater {
51+ model: indicatorWidget.icons
52+
50− Image {
53+ Image {
51− id: itemImage
54+ id: itemImage
52− objectName: "itemImage"
55+ objectName: "itemImage"
53− visible: source != ""
56+ visible: source != ""
54− source: modelData
57+ source: modelData
55− height: indicatorWidget.iconSize
58+ height: indicatorWidget.iconSize
56− width: indicatorWidget.iconSize
59+ width: indicatorWidget.iconSize
57− anchors.verticalCenter: parent.verticalCenter
60+ anchors.verticalCenter: parent.verticalCenter
61+ }
58 }
62 }
59 }
63 }
60
64
61− // FIXME : Should us Ubuntu.Icon . results in low res images
62−
63−
64 Label {
65 Label {
65 id: itemLabel
66 id: itemLabel
66 objectName: "itemLabel"
67 objectName: "itemLabel"
Panel/Indicators/NetworkIndicatorWidget.qml+1−1
@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators
24Indicators.IndicatorWidget {
24Indicators.IndicatorWidget {
25 id: indicatorWidget
25 id: indicatorWidget
26
26
27− width: networkIcon.width + units.gu(1)
27+ width: networkIcon.width + units.gu(0.7)
28
28
29 property int signalStrength: 0
29 property int signalStrength: 0
30 property int connectionState: Indicators.NetworkConnection.Initial
30 property int connectionState: Indicators.NetworkConnection.Initial