git.iko.soy/unity8
on xenial help sign in
few indicator client fixes
commitf0634500aaa3c0a0cf46ac3cc9a2728d0cc7726f authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 7 Jun 2013, 14:51 (13 years ago) parentf5a8ec7
3 files changed+4−8
compare with xenial
unifiedsplit
Panel/Indicators.qml+2−4 Panel/MenuContent.qml+1−1 plugins/IndicatorsClient/qml/FactoryMenu.qml+1−3
Panel/Indicators.qml+2−4
@@ -45,6 +45,7 @@ Showable {
4545 if (contentProgress <= hintValue && indicators.state == "reveal") {
4646 indicators.state = "hint"
4747 menuContent.hideAll()
48+ menuContent.releaseContent()
4849 } else if (contentProgress > hintValue && contentProgress < lockThreshold) {
4950 menuContent.showMenu()
5051 indicators.state = "reveal"
@@ -60,10 +61,6 @@ Showable {
6061 indicators.state = "locked"
6162 }
6263 }
63−
64− if (contentProgress == 0) {
65− menuContent.releaseContent()
66− }
6764 }
6865
6966 function handlePress() {
@@ -236,6 +233,7 @@ Showable {
236233 if (hideAnimation.running) {
237234 indicators.state = "initial"
238235 menuContent.hideAll()
236+ menuContent.releaseContent()
239237 } else {
240238 if (state == "initial") indicatorRow.setDefaultItem()
241239 }
Panel/MenuContent.qml+1−1
@@ -29,7 +29,7 @@ Rectangle {
2929 property bool __contentActive: false
3030 property alias currentIndex : menus.currentIndex
3131 property color backgroundColor: "#221e1c"
32− property int contentReleaseInterval: 5000
32+ property int contentReleaseInterval: 20000
3333
3434 width: units.gu(40)
3535 height: units.gu(42)
plugins/IndicatorsClient/qml/FactoryMenu.qml+1−3
@@ -66,8 +66,7 @@ Item {
6666 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
6767 Component { id: wifiSection; ICNetwork.WifiSection {} }
6868 Component { id: accessPoint; ICNetwork.AccessPoint {} }
69−
70− Component { id: indicatorMenu; IC.Menu {Component.onCompleted: console.log("menu created");} }
69+ Component { id: indicatorMenu; IC.Menu {} }
7170
7271 Loader {
7372 id: __loader
@@ -83,7 +82,6 @@ Item {
8382 if (widgetType) {
8483 var component = _map[widgetType]
8584 if (component != undefined) {
86− console.log(component);
8785 return component
8886 }
8987 }