on xenial help sign in
Re-enable MenuContentActivator in Indicators.

Approved by PS Jenkins bot, Daniel d'Andrada.

commit1006d3ba247c8fa5c684c731077984103d369489 authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 23 Sep 2013, 23:53 (13 years ago) parent398f2ddde63196
1 file changed+12−2
Panel/MenuContent.qml+12−2
Panel/MenuContent.qml+12−2
@@ -109,7 +109,7 @@ MainView {
109109 source: pageSource
110110 asynchronous: true
111111
112− property bool contentActive: content.__contentActive
112+ property bool contentActive: content.__contentActive && menuActivator.content[index].active
113113
114114 onContentActiveChanged: {
115115 if (contentActive && item) {
@@ -146,6 +146,16 @@ MainView {
146146 id: contentReleaseTimer
147147
148148 interval: contentReleaseInterval
149− onTriggered: content.__contentActive = false
149+ onTriggered: {
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
150160 }
151161}