git.iko.soy/unity8
on xenial help sign in
Re-enable MenuContentActivator in Indicators.
1006d3bNick Dedekind
Panel/MenuContent.qml+12−2
compare with xenial
unifiedsplit
@@ -109,7 +109,7 @@ MainView {
109 source: pageSource
109 source: pageSource
110 asynchronous: true
110 asynchronous: true
111
111
112− property bool contentActive: content.__contentActive
112+ property bool contentActive: content.__contentActive && menuActivator.content[index].active
113
113
114 onContentActiveChanged: {
114 onContentActiveChanged: {
115 if (contentActive && item) {
115 if (contentActive && item) {
@@ -146,6 +146,16 @@ MainView {
146 id: contentReleaseTimer
146 id: contentReleaseTimer
147
147
148 interval: contentReleaseInterval
148 interval: contentReleaseInterval
149+ onTriggered: {
149− onTriggered: content.__contentActive = false
150+ content.__contentActive = false;
151+ menuActivator.clear();
152+ }
153+ }
154+
155+ Indicators.MenuContentActivator {
156+ id: menuActivator
157+ running: content.__contentActive
158+ baseIndex: content.currentMenuIndex
159+ count: indicatorsModel.count
150 }
160 }
151}
161}