git.iko.soy/unity8
on xenial help sign in
fix for fullscreen apps not taking the panel height into account
commita15783bc37d3f15cf01dbb68d91b5f22b47e16b5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 20 Nov 2015, 05:11 (11 years ago) parentd52c341
4 files changed+17−4
compare with xenial
unifiedsplit
qml/Components/PanelState/PanelState.qml+1 qml/Panel/Panel.qml+6 qml/Stages/DecoratedWindow.qml+1−1 qml/Stages/DesktopStage.qml+9−3
qml/Components/PanelState/PanelState.qml+1
@@ -23,6 +23,7 @@ QtObject {
2323 property string title: ""
2424 property bool buttonsVisible: false
2525 property bool dropShadow: false
26+ property real panelHeight: units.gu(3)
2627
2728 signal close()
2829 signal minimize()
qml/Panel/Panel.qml+6
@@ -48,6 +48,12 @@ Item {
4848 }
4949 }
5050
51+ Binding {
52+ target: PanelState
53+ property: "panelHeight"
54+ value: indicators.minimizedPanelHeight
55+ }
56+
5157 Item {
5258 id: indicatorArea
5359 objectName: "indicatorArea"
qml/Stages/DecoratedWindow.qml+1−1
@@ -85,7 +85,7 @@ FocusScope {
8585 anchors.topMargin: decoration.height
8686 anchors.left: parent.left
8787 width: root.width
88− height: root.height - decoration.height
88+ height: fullscreen ? root.height : root.height - decoration.height
8989 interactive: true
9090 focus: true
9191 }
qml/Stages/DesktopStage.qml+9−3
@@ -233,7 +233,7 @@ AbstractStage {
233233 id: appDelegate
234234 objectName: "appDelegate_" + appId
235235 z: ApplicationManager.count - index
236− y: units.gu(3)
236+ y: PanelState.panelHeight
237237 width: units.gu(60)
238238 height: units.gu(50)
239239 focus: appId === priv.focusedAppId
@@ -319,6 +319,10 @@ AbstractStage {
319319 State {
320320 name: "fullscreen"; when: decoratedWindow.fullscreen
321321 extend: "maximized"
322+ PropertyChanges {
323+ target: appDelegate;
324+ y: -PanelState.panelHeight
325+ }
322326 },
323327 State {
324328 name: "normal";
@@ -342,11 +346,13 @@ AbstractStage {
342346 },
343347 State {
344348 name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
345− PropertyChanges { target: appDelegate; x: 0; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
349+ PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
350+ width: root.width/2; height: root.height - PanelState.panelHeight }
346351 },
347352 State {
348353 name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
349− PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
354+ PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
355+ width: root.width/2; height: root.height - PanelState.panelHeight }
350356 },
351357 State {
352358 name: "minimized"; when: appDelegate.minimized