git.iko.soy/unity8
on xenial help sign in
Use MenuContentActivator in tabs menu content
de63196Nick Dedekind
Panel/MenuContent.qml+12−2
compare with xenial
unifiedsplit
@@ -91,7 +91,7 @@ MainView {
91 source: pageSource
91 source: pageSource
92 asynchronous: true
92 asynchronous: true
93
93
94− property bool contentActive: content.__contentActive
94+ property bool contentActive: content.__contentActive && menuActivator.content[index].active
95
95
96 onContentActiveChanged: {
96 onContentActiveChanged: {
97 if (contentActive && item) {
97 if (contentActive && item) {
@@ -128,6 +128,16 @@ MainView {
128 id: contentReleaseTimer
128 id: contentReleaseTimer
129
129
130 interval: contentReleaseInterval
130 interval: contentReleaseInterval
131+ onTriggered: {
131− onTriggered: content.__contentActive = false
132+ content.__contentActive = false;
133+ menuActivator.clear();
134+ }
135+ }
136+
137+ Indicators.MenuContentActivator {
138+ id: menuActivator
139+ running: content.__contentActive
140+ baseIndex: content.currentMenuIndex
141+ count: indicatorsModel.count
132 }
142 }
133}
143}