git.iko.soy/unity8
on xenial help sign in
active header
aa1385eNick Dedekind
Panel/Indicators.qml+1
compare with xenial
unifiedsplit
@@ -177,6 +177,7 @@ Showable {
177 }
177 }
178 indicatorsModel: indicatorsModel
178 indicatorsModel: indicatorsModel
179 clip: !indicators.fullyOpened
179 clip: !indicators.fullyOpened
180+ activeHeader: indicators.state == "hint" || indicators.state == "reveal"
180
181
181 Connections {
182 Connections {
182 target: indicatorRow
183 target: indicatorRow
Panel/MenuContentTabs.qml+10
@@ -26,6 +26,7 @@ MainView {
26 readonly property int currentMenuIndex : tabs.selectedTabIndex
26 readonly property int currentMenuIndex : tabs.selectedTabIndex
27 backgroundColor: "#221e1c" // FIXME not in palette yet
27 backgroundColor: "#221e1c" // FIXME not in palette yet
28 property int contentReleaseInterval: 20000
28 property int contentReleaseInterval: 20000
29+ property bool activeHeader: false
29
30
30 width: units.gu(40)
31 width: units.gu(40)
31 height: units.gu(42)
32 height: units.gu(42)
@@ -37,7 +38,11 @@ MainView {
37
38
38 function setCurrentMenuIndex(index) {
39 function setCurrentMenuIndex(index) {
39 if (currentMenuIndex !== index) {
40 if (currentMenuIndex !== index) {
41+ if (currentMenuIndex == -1) {
42+ tabs.tabBar.animate = false;
43+ }
40 tabs.selectedTabIndex = index;
44 tabs.selectedTabIndex = index;
45+ tabs.tabBar.animate = true;
41 }
46 }
42 }
47 }
43
48
@@ -52,6 +57,11 @@ MainView {
52 }
57 }
53 }
58 }
54
59
60+ onActiveHeaderChanged: {
61+ tabs.tabBar.active = activeHeader;
62+ tabs.tabBar.alwaysActive = activeHeader;
63+ }
64+
55 Tabs {
65 Tabs {
56 id: tabs
66 id: tabs
57 anchors.fill: parent
67 anchors.fill: parent