git.iko.soy/unity8
on xenial help sign in
review comments - heights
c858d14Nick Dedekind
modules/Unity/Indicators/Network/qml/AccessPoint.qml−2
compare with xenial
unifiedsplit
@@ -27,8 +27,6 @@ Indicators.MenuItem {
27 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
27 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
28 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
28 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
29
29
30− implicitHeight: units.gu(7)
31−
32 function getNetworkIcon(data) {
30 function getNetworkIcon(data) {
33 var imageName = "nm-signal-100"
31 var imageName = "nm-signal-100"
34 var signalStrength = parseInt(wifiApStrength)
32 var signalStrength = parseInt(wifiApStrength)
modules/Unity/Indicators/qml/MenuItem.qml−2
@@ -30,13 +30,11 @@ BasicMenuItem {
30 implicitHeight: units.gu(7)
30 implicitHeight: units.gu(7)
31
31
32 HLine {
32 HLine {
33− id: ___topHLine
34 anchors.top: parent.top
33 anchors.top: parent.top
35 color: "#403b37"
34 color: "#403b37"
36 }
35 }
37
36
38 HLine {
37 HLine {
39− id: ___bottomHLine
40 anchors.bottom: parent.bottom
38 anchors.bottom: parent.bottom
41 color: "#060606"
39 color: "#060606"
42 }
40 }
modules/Unity/Indicators/qml/MenuItemFactory.qml+9−6
@@ -31,7 +31,7 @@ Item {
31 property bool isCurrentItem
31 property bool isCurrentItem
32 readonly property bool empty: (__loader.item !== undefined && __loader.status == Loader.Ready) ? __loader.item.state === "EMPTY" : true
32 readonly property bool empty: (__loader.item !== undefined && __loader.status == Loader.Ready) ? __loader.item.state === "EMPTY" : true
33
33
34− implicitHeight: (__loader.status === Loader.Ready) ? __loader.item.implicitHeight : 0
34+ implicitHeight: __loader.height
35
35
36 signal activated()
36 signal activated()
37 signal deactivated()
37 signal deactivated()
@@ -71,8 +71,13 @@ Item {
71
71
72 Loader {
72 Loader {
73 id: __loader
73 id: __loader
74− anchors.fill: parent
75 asynchronous: true
74 asynchronous: true
75+
76+ anchors {
77+ left: parent.left
78+ right: parent.right
79+ }
80+
76 sourceComponent: {
81 sourceComponent: {
77 if (!__menuFactory.menu || !__menuFactory.menu.extra) {
82 if (!__menuFactory.menu || !__menuFactory.menu.extra) {
78 return undefined;
83 return undefined;
@@ -81,15 +86,13 @@ Item {
81 var widgetType = __menuFactory.menu.extra.canonical_type;
86 var widgetType = __menuFactory.menu.extra.canonical_type;
82 if (widgetType) {
87 if (widgetType) {
83 return _map[widgetType];
88 return _map[widgetType];
84− }
85− else {
89+ } else {
86 if (widgetType === "com.canonical.indicator.root") {
90 if (widgetType === "com.canonical.indicator.root") {
87 return undefined;
91 return undefined;
88 // Try discovery the item based on the basic properties
92 // Try discovery the item based on the basic properties
89 } else if (menu.hasSection) {
93 } else if (menu.hasSection) {
90 return sectionMenu;
94 return sectionMenu;
91− }
92− else {
95+ } else {
93 return indicatorMenu;
96 return indicatorMenu;
94 }
97 }
95 }
98 }