Unity 8

Merge lp:~lukas-kde/unity8/fix-windows-behind-unmaximize-transition into lp:unity8

fix-windows-behind-unmaximize-transition
Merge into trunk

Proposed by Lukáš Tinkl on 2017-03-30

Status:

Merged

Approved by:

Michael Zanetti on 2017-04-04

Approved revision:

2894

Merged at revision:

2918

Proposed branch:

lp:~lukas-kde/unity8/fix-windows-behind-unmaximize-transition

Merge into:

lp:unity8

Diff against target:

40 lines (+9/-4)

1 file modified

qml/Stage/Stage.qml (+9/-4)

To merge this branch:

bzr merge lp:~lukas-kde/unity8/fix-windows-behind-unmaximize-transition

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2017-03-30	Approve on 2017-04-04
Unity8 CI Bot	continuous-integration		Approve on 2017-04-03
Review via email: mp+321440@code.launchpad.net

Commit Message

Do not occlude windows with an ongoing unmaximize transition

Description of the Change

Do not occlude windows with an ongoing unmaximize transition

This is a partial spin-off from https://code.launchpad.net/~lukas-kde/unity8/occlusion-transparency/+merge/317769 to fix bug lp:1666363

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-30:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3604/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

FAILED: Continuous integration, rev:2892
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3617/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4794/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4822/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3617/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/fix-windows-behind-unmaximize-transition updated on 2017-03-31

2893. By Lukáš Tinkl on 2017-03-31: merge trunk, resolve conflicts

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3620/rebuild

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2017-04-03:

why isn't the visuallyMaximized flag not enough any more?

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2017-04-03:

I think instead of adding yet another flag, all that would be required is to split the transition into two: one for maximizing, where we have the PropertyAction on visuallyMaximized in the end, and one for unmaximizing, where that propertyaction is at the beginning

Michał Sawicz (saviq) wrote on 2017-04-03:

Or using a reversed transition?

lp:~lukas-kde/unity8/fix-windows-behind-unmaximize-transition updated on 2017-04-03

2894. By Lukáš Tinkl on 2017-04-03: get rid of the extra boolean

Lukáš Tinkl (lukas-kde) wrote on 2017-04-03:

Got rid of the extra boolean, now using only visuallyMaximized

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-03:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3648/rebuild

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2017-04-04:

yip yip! This is what I expected to see now :)

CI green too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Stage/Stage.qml'
2	--- qml/Stage/Stage.qml 2017-03-28 21:46:37 +0000
3	+++ qml/Stage/Stage.qml 2017-04-03 15:17:27 +0000
4	@@ -1380,7 +1380,6 @@
5	requestedX: root.availableDesktopArea.x;
6	requestedY: 0;
7	visuallyMinimized: false;
8	- visuallyMaximized: true
9	requestedWidth: root.availableDesktopArea.width;
10	requestedHeight: appContainer.height;
11	}
12	@@ -1403,7 +1402,6 @@
13	PropertyChanges {
14	target: appDelegate
15	visuallyMinimized: false
16	- visuallyMaximized: false
17	}
18	PropertyChanges { target: touchControls; enabled: true }
19	PropertyChanges { target: resizeArea; enabled: true }
20	@@ -1596,11 +1594,18 @@
21	to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
22	enabled: appDelegate.animationsEnabled
23	SequentialAnimation {
24	+ ScriptAction { script: {
25	+ if (appDelegate.visuallyMaximized) visuallyMaximized = false; // maximized before -> going to restored
26	+ }
27	+ }
28	PropertyAction { target: appDelegate; property: "visuallyMinimized" }
29	UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
30	duration: priv.animationDuration }
31	- PropertyAction { target: appDelegate; property: "visuallyMaximized" }
32	- ScriptAction { script: { fakeRectangle.stop(); } }
33	+ ScriptAction { script: {
34	+ fakeRectangle.stop();
35	+ appDelegate.visuallyMaximized = appDelegate.maximized; // reflect the target state
36	+ }
37	+ }
38	}
39	}
40	]