git.iko.soy/unity8
on xenial help sign in
update (c) and rename property inPanel -> windowIsMaximized
8764069Lukáš Tinkl
qml/Components/WindowControlButtons.qml+3−3
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Row {
23
23
24 // to be set from outside
24 // to be set from outside
25 property bool active: false
25 property bool active: false
26− property bool inPanel: false
26+ property bool windowIsMaximized: false
27
27
28 signal close()
28 signal close()
29 signal minimize()
29 signal minimize()
@@ -90,7 +90,7 @@ Row {
90 Icon {
90 Icon {
91 anchors.fill: parent
91 anchors.fill: parent
92 anchors.margins: units.dp(3)
92 anchors.margins: units.dp(3)
93− source: root.inPanel ? "graphics/window-window.svg" : "graphics/window-maximize.svg"
93+ source: root.windowIsMaximized ? "graphics/window-window.svg" : "graphics/window-maximize.svg"
94 color: root.active ? "white" : UbuntuColors.slate
94 color: root.active ? "white" : UbuntuColors.slate
95 }
95 }
96 }
96 }
qml/Panel/Panel.qml+1−1
@@ -126,7 +126,7 @@ Item {
126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible
127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible
128 active: PanelState.buttonsVisible
128 active: PanelState.buttonsVisible
129− inPanel: true
129+ windowIsMaximized: true
130 onClose: PanelState.close()
130 onClose: PanelState.close()
131 onMinimize: PanelState.minimize()
131 onMinimize: PanelState.minimize()
132 onMaximize: PanelState.maximize()
132 onMaximize: PanelState.maximize()