git.iko.soy/unity8
on xenial help sign in
Use set*Index for menu & item indexes
commit5339fb6bf756e7a6a5b56a1303b8938dc432eaa2 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 26 Jul 2013, 07:56 (13 years ago) parent4700fae
3 files changed+16−10
compare with xenial
unifiedsplit
Panel/Indicators.qml+2−6 Panel/MenuContent.qml+6−2 Panel/MenuContentTabs.qml+8−2
Panel/Indicators.qml+2−6
@@ -179,12 +179,8 @@ Showable {
179179
180180 Connections {
181181 target: indicatorRow
182− onCurrentItemIndexChanged: menuContent.updateCurrentMenu();
183− }
184−
185− function updateCurrentMenu() {
186− if (currentMenuIndex != indicatorRow.currentItemIndex) {
187− currentMenuIndex = indicatorRow.currentItemIndex;
182+ onCurrentItemIndexChanged: {
183+ menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);
188184 }
189185 }
190186
Panel/MenuContent.qml+6−2
@@ -24,7 +24,7 @@ Rectangle {
2424
2525 property QtObject indicatorsModel: null
2626 property bool __contentActive: false
27− property alias currentMenuIndex : menus.currentIndex
27+ readonly property int currentMenuIndex : menus.currentIndex
2828 property color backgroundColor: "#221e1c" // FIXME not in palette yet
2929 property int contentReleaseInterval: 20000
3030
@@ -32,7 +32,11 @@ Rectangle {
3232 height: units.gu(42)
3333 color: backgroundColor
3434
35− signal menuSelected(int index)
35+ function setCurrentMenuIndex(index) {
36+ if (currentMenuIndex !== index) {
37+ menus.currentIndex = index;
38+ }
39+ }
3640
3741 function activateContent() {
3842 contentReleaseTimer.stop();
Panel/MenuContentTabs.qml+8−2
@@ -23,8 +23,8 @@ MainView {
2323 id: content
2424
2525 property QtObject indicatorsModel: null
26− property alias currentMenuIndex : tabs.selectedTabIndex
27− backgroundColor: "#221e1c"
26+ readonly property int currentMenuIndex : tabs.selectedTabIndex
27+ backgroundColor: "#221e1c" // FIXME not in palette yet
2828 property int contentReleaseInterval: 20000
2929
3030 width: units.gu(40)
@@ -35,6 +35,12 @@ MainView {
3535 property bool contentActive: false
3636 }
3737
38+ function setCurrentMenuIndex(index) {
39+ if (currentMenuIndex !== index) {
40+ tabs.selectedTabIndex = index;
41+ }
42+ }
43+
3844 function activateContent() {
3945 contentReleaseTimer.stop();
4046 d.contentActive = true;