git.iko.soy/unity8
on xenial help sign in
fix for fullscreen apps not taking the panel height into account
a15783bLukáš Tinkl
qml/Components/PanelState/PanelState.qml+1
compare with xenial
unifiedsplit
@@ -23,6 +23,7 @@ QtObject {
23 property string title: ""
23 property string title: ""
24 property bool buttonsVisible: false
24 property bool buttonsVisible: false
25 property bool dropShadow: false
25 property bool dropShadow: false
26+ property real panelHeight: units.gu(3)
26
27
27 signal close()
28 signal close()
28 signal minimize()
29 signal minimize()
qml/Panel/Panel.qml+6
@@ -48,6 +48,12 @@ Item {
48 }
48 }
49 }
49 }
50
50
51+ Binding {
52+ target: PanelState
53+ property: "panelHeight"
54+ value: indicators.minimizedPanelHeight
55+ }
56+
51 Item {
57 Item {
52 id: indicatorArea
58 id: indicatorArea
53 objectName: "indicatorArea"
59 objectName: "indicatorArea"
qml/Stages/DecoratedWindow.qml+1−1
@@ -85,7 +85,7 @@ FocusScope {
85 anchors.topMargin: decoration.height
85 anchors.topMargin: decoration.height
86 anchors.left: parent.left
86 anchors.left: parent.left
87 width: root.width
87 width: root.width
88− height: root.height - decoration.height
88+ height: fullscreen ? root.height : root.height - decoration.height
89 interactive: true
89 interactive: true
90 focus: true
90 focus: true
91 }
91 }
qml/Stages/DesktopStage.qml+9−3
@@ -233,7 +233,7 @@ AbstractStage {
233 id: appDelegate
233 id: appDelegate
234 objectName: "appDelegate_" + appId
234 objectName: "appDelegate_" + appId
235 z: ApplicationManager.count - index
235 z: ApplicationManager.count - index
236− y: units.gu(3)
236+ y: PanelState.panelHeight
237 width: units.gu(60)
237 width: units.gu(60)
238 height: units.gu(50)
238 height: units.gu(50)
239 focus: appId === priv.focusedAppId
239 focus: appId === priv.focusedAppId
@@ -319,6 +319,10 @@ AbstractStage {
319 State {
319 State {
320 name: "fullscreen"; when: decoratedWindow.fullscreen
320 name: "fullscreen"; when: decoratedWindow.fullscreen
321 extend: "maximized"
321 extend: "maximized"
322+ PropertyChanges {
323+ target: appDelegate;
324+ y: -PanelState.panelHeight
325+ }
322 },
326 },
323 State {
327 State {
324 name: "normal";
328 name: "normal";
@@ -342,11 +346,13 @@ AbstractStage {
342 },
346 },
343 State {
347 State {
344 name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
348 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 }
346 },
351 },
347 State {
352 State {
348 name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
353 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 }
350 },
356 },
351 State {
357 State {
352 name: "minimized"; when: appDelegate.minimized
358 name: "minimized"; when: appDelegate.minimized