Unity 8

Merge lp:~dandrader/unity8/refactorWindowDecoration into lp:unity8

refactorWindowDecoration
Merge into trunk

Proposed by Daniel d'Andrada on 2016-11-10

Status:	Merged
Approved by:	Michael Zanetti on 2016-11-11
Approved revision:	2676
Merged at revision:	2713
Proposed branch:	lp:~dandrader/unity8/refactorWindowDecoration
Merge into:	lp:unity8
Diff against target:	75 lines (+20/-9) 3 files modified qml/Stage/DecoratedWindow.qml (+1/-1) qml/Stage/Stage.qml (+15/-3) qml/Stage/WindowDecoration.qml (+4/-5)
To merge this branch:	bzr merge lp:~dandrader/unity8/refactorWindowDecoration
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-11-10	Approve on 2016-11-11
Unity8 CI Bot	continuous-integration		Approve on 2016-11-10
Review via email: mp+310528@code.launchpad.net

Commit Message

There's no need for WindowDecoration to access the appDelegate

It damages modularity.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, in "make tryDesktopStage".

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Michael Zanetti (mzanetti) wrote on 2016-11-10:

would it make sense to have closeButtonVisible to be just an alias instead of its own property?

apart from that, definitely +1 from here.

review: Needs Information

lp:~dandrader/unity8/refactorWindowDecoration updated on 2016-11-10

2676. By Daniel d'Andrada on 2016-11-10: Make it an alias

Daniel d'Andrada (dandrader) wrote on 2016-11-10:

> would it make sense to have closeButtonVisible to be just an alias instead of
> its own property?
>
> apart from that, definitely +1 from here.

That works as well. Done.

Michael Zanetti (mzanetti) wrote on 2016-11-10:

tested. works fine. +1 on the code.

waiting for CI before top-approving

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-10:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-10:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-10:

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-11-11:

the failure seems unrelated... top-approving

review: Approve

Michael Zanetti (mzanetti) wrote on 2016-11-11:

actually it even passed

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:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Stage/DecoratedWindow.qml'
2	--- qml/Stage/DecoratedWindow.qml 2016-10-07 11:20:09 +0000
3	+++ qml/Stage/DecoratedWindow.qml 2016-11-10 13:16:55 +0000
4	@@ -149,7 +149,7 @@
5
6	WindowDecoration {
7	id: decoration
8	- target: root.parent \|\| null
9	+ closeButtonVisible: root.application.appId !== "unity8-dash"
10	objectName: "appWindowDecoration"
11	anchors { left: parent.left; top: parent.top; right: parent.right }
12	height: units.gu(3)
13
14	=== modified file 'qml/Stage/Stage.qml'
15	--- qml/Stage/Stage.qml 2016-10-24 11:34:20 +0000
16	+++ qml/Stage/Stage.qml 2016-11-10 13:16:55 +0000
17	@@ -1467,9 +1467,21 @@
18	onRequestedHeightChanged: oldRequestedHeight = requestedHeight
19
20	onCloseClicked: { appDelegate.close(); }
21	- onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
22	- onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
23	- onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
24	+ onMaximizeClicked: {
25	+ if (appDelegate.canBeMaximized) {
26	+ appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
27	+ }
28	+ }
29	+ onMaximizeHorizontallyClicked: {
30	+ if (appDelegate.canBeMaximizedHorizontally) {
31	+ appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
32	+ }
33	+ }
34	+ onMaximizeVerticallyClicked: {
35	+ if (appDelegate.canBeMaximizedVertically) {
36	+ appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
37	+ }
38	+ }
39	onMinimizeClicked: appDelegate.minimize()
40	onDecorationPressed: { appDelegate.focus = true; }
41	onDecorationReleased: fakeRectangle.commit();
42
43	=== modified file 'qml/Stage/WindowDecoration.qml'
44	--- qml/Stage/WindowDecoration.qml 2016-09-22 10:33:39 +0000
45	+++ qml/Stage/WindowDecoration.qml 2016-11-10 13:16:55 +0000
46	@@ -22,7 +22,7 @@
47	id: root
48	clip: true
49
50	- property Item target // appDelegate
51	+ property alias closeButtonVisible: buttons.closeButtonShown
52	property alias title: titleLabel.text
53	property alias maximizeButtonShown: buttons.maximizeButtonShown
54	property bool active: false
55	@@ -40,7 +40,7 @@
56	signal maximizeVerticallyClicked()
57
58	onDoubleClicked: {
59	- if (target.canBeMaximized && mouse.button == Qt.LeftButton) {
60	+ if (mouse.button == Qt.LeftButton) {
61	root.maximizeClicked();
62	}
63	}
64	@@ -77,9 +77,8 @@
65	onCloseClicked: root.closeClicked();
66	onMinimizeClicked: root.minimizeClicked();
67	onMaximizeClicked: root.maximizeClicked();
68	- onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
69	- onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
70	- closeButtonShown: root.target.appId !== "unity8-dash"
71	+ onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();
72	+ onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();
73	}
74
75	Label {