git.iko.soy/unity8
on xenial help sign in
few indicator client fixes
f063450Nick Dedekind
Panel/Indicators.qml+2−4
compare with xenial
unifiedsplit
@@ -45,6 +45,7 @@ Showable {
45 if (contentProgress <= hintValue && indicators.state == "reveal") {
45 if (contentProgress <= hintValue && indicators.state == "reveal") {
46 indicators.state = "hint"
46 indicators.state = "hint"
47 menuContent.hideAll()
47 menuContent.hideAll()
48+ menuContent.releaseContent()
48 } else if (contentProgress > hintValue && contentProgress < lockThreshold) {
49 } else if (contentProgress > hintValue && contentProgress < lockThreshold) {
49 menuContent.showMenu()
50 menuContent.showMenu()
50 indicators.state = "reveal"
51 indicators.state = "reveal"
@@ -60,10 +61,6 @@ Showable {
60 indicators.state = "locked"
61 indicators.state = "locked"
61 }
62 }
62 }
63 }
63−
64− if (contentProgress == 0) {
65− menuContent.releaseContent()
66− }
67 }
64 }
68
65
69 function handlePress() {
66 function handlePress() {
@@ -236,6 +233,7 @@ Showable {
236 if (hideAnimation.running) {
233 if (hideAnimation.running) {
237 indicators.state = "initial"
234 indicators.state = "initial"
238 menuContent.hideAll()
235 menuContent.hideAll()
236+ menuContent.releaseContent()
239 } else {
237 } else {
240 if (state == "initial") indicatorRow.setDefaultItem()
238 if (state == "initial") indicatorRow.setDefaultItem()
241 }
239 }
Panel/MenuContent.qml+1−1
@@ -29,7 +29,7 @@ Rectangle {
29 property bool __contentActive: false
29 property bool __contentActive: false
30 property alias currentIndex : menus.currentIndex
30 property alias currentIndex : menus.currentIndex
31 property color backgroundColor: "#221e1c"
31 property color backgroundColor: "#221e1c"
32− property int contentReleaseInterval: 5000
32+ property int contentReleaseInterval: 20000
33
33
34 width: units.gu(40)
34 width: units.gu(40)
35 height: units.gu(42)
35 height: units.gu(42)
plugins/IndicatorsClient/qml/FactoryMenu.qml+1−3
@@ -66,8 +66,7 @@ Item {
66 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
66 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
67 Component { id: wifiSection; ICNetwork.WifiSection {} }
67 Component { id: wifiSection; ICNetwork.WifiSection {} }
68 Component { id: accessPoint; ICNetwork.AccessPoint {} }
68 Component { id: accessPoint; ICNetwork.AccessPoint {} }
69−
70− Component { id: indicatorMenu; IC.Menu {Component.onCompleted: console.log("menu created");} }
69+ Component { id: indicatorMenu; IC.Menu {} }
71
70
72 Loader {
71 Loader {
73 id: __loader
72 id: __loader
@@ -83,7 +82,6 @@ Item {
83 if (widgetType) {
82 if (widgetType) {
84 var component = _map[widgetType]
83 var component = _map[widgetType]
85 if (component != undefined) {
84 if (component != undefined) {
86− console.log(component);
87 return component
85 return component
88 }
86 }
89 }
87 }