on xenial help sign in
review comments - heights
commitc858d1427f4b97f49f8cda20248b479b4c3ca345 authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 1 Jul 2013, 11:44 (13 years ago) parent9e6ce1f
3 files changed+9−10
modules/Unity/Indicators/Network/qml/AccessPoint.qml−2 modules/Unity/Indicators/qml/MenuItem.qml−2 modules/Unity/Indicators/qml/MenuItemFactory.qml+9−6
modules/Unity/Indicators/Network/qml/AccessPoint.qml−2
@@ -27,8 +27,6 @@ Indicators.MenuItem {
2727 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
2828 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
2929
30− implicitHeight: units.gu(7)
31−
3230 function getNetworkIcon(data) {
3331 var imageName = "nm-signal-100"
3432 var signalStrength = parseInt(wifiApStrength)
modules/Unity/Indicators/qml/MenuItem.qml−2
@@ -30,13 +30,11 @@ BasicMenuItem {
3030 implicitHeight: units.gu(7)
3131
3232 HLine {
33− id: ___topHLine
3433 anchors.top: parent.top
3534 color: "#403b37"
3635 }
3736
3837 HLine {
39− id: ___bottomHLine
4038 anchors.bottom: parent.bottom
4139 color: "#060606"
4240 }
modules/Unity/Indicators/qml/MenuItemFactory.qml+9−6
@@ -31,7 +31,7 @@ Item {
3131 property bool isCurrentItem
3232 readonly property bool empty: (__loader.item !== undefined && __loader.status == Loader.Ready) ? __loader.item.state === "EMPTY" : true
3333
34− implicitHeight: (__loader.status === Loader.Ready) ? __loader.item.implicitHeight : 0
34+ implicitHeight: __loader.height
3535
3636 signal activated()
3737 signal deactivated()
@@ -71,8 +71,13 @@ Item {
7171
7272 Loader {
7373 id: __loader
74− anchors.fill: parent
7574 asynchronous: true
75+
76+ anchors {
77+ left: parent.left
78+ right: parent.right
79+ }
80+
7681 sourceComponent: {
7782 if (!__menuFactory.menu || !__menuFactory.menu.extra) {
7883 return undefined;
@@ -81,15 +86,13 @@ Item {
8186 var widgetType = __menuFactory.menu.extra.canonical_type;
8287 if (widgetType) {
8388 return _map[widgetType];
84− }
85− else {
89+ } else {
8690 if (widgetType === "com.canonical.indicator.root") {
8791 return undefined;
8892 // Try discovery the item based on the basic properties
8993 } else if (menu.hasSection) {
9094 return sectionMenu;
91− }
92− else {
95+ } else {
9396 return indicatorMenu;
9497 }
9598 }