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
149
149
6
150
    WindowDecoration {
150
    WindowDecoration {
7
151
        id: decoration
151
        id: decoration
9
152
        target: root.parent || null
152
        closeButtonVisible: root.application.appId !== "unity8-dash"
10
153
        objectName: "appWindowDecoration"
153
        objectName: "appWindowDecoration"
11
154
        anchors { left: parent.left; top: parent.top; right: parent.right }
154
        anchors { left: parent.left; top: parent.top; right: parent.right }
12
155
        height: units.gu(3)
155
        height: units.gu(3)
13
156
156
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
1467
                    onRequestedHeightChanged: oldRequestedHeight = requestedHeight
1467
                    onRequestedHeightChanged: oldRequestedHeight = requestedHeight
19
1468
1468
20
1469
                    onCloseClicked: { appDelegate.close(); }
1469
                    onCloseClicked: { appDelegate.close(); }
24
1470
                    onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
1470
                    onMaximizeClicked: {
25
1471
                    onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
1471
                        if (appDelegate.canBeMaximized) {
26
1472
                    onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
1472
                            appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
27
1473
                        }
28
1474
                    }
29
1475
                    onMaximizeHorizontallyClicked: {
30
1476
                        if (appDelegate.canBeMaximizedHorizontally) {
31
1477
                            appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
32
1478
                        }
33
1479
                    }
34
1480
                    onMaximizeVerticallyClicked: {
35
1481
                        if (appDelegate.canBeMaximizedVertically) {
36
1482
                            appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
37
1483
                        }
38
1484
                    }
39
1473
                    onMinimizeClicked: appDelegate.minimize()
1485
                    onMinimizeClicked: appDelegate.minimize()
40
1474
                    onDecorationPressed: { appDelegate.focus = true; }
1486
                    onDecorationPressed: { appDelegate.focus = true; }
41
1475
                    onDecorationReleased: fakeRectangle.commit();
1487
                    onDecorationReleased: fakeRectangle.commit();
42
1476
1488
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
22
    id: root
22
    id: root
48
23
    clip: true
23
    clip: true
49
24
24
51
25
    property Item target // appDelegate
25
    property alias closeButtonVisible: buttons.closeButtonShown
52
26
    property alias title: titleLabel.text
26
    property alias title: titleLabel.text
53
27
    property alias maximizeButtonShown: buttons.maximizeButtonShown
27
    property alias maximizeButtonShown: buttons.maximizeButtonShown
54
28
    property bool active: false
28
    property bool active: false
55
@@ -40,7 +40,7 @@
56
40
    signal maximizeVerticallyClicked()
40
    signal maximizeVerticallyClicked()
57
41
41
58
42
    onDoubleClicked: {
42
    onDoubleClicked: {
60
43
        if (target.canBeMaximized && mouse.button == Qt.LeftButton) {
43
        if (mouse.button == Qt.LeftButton) {
61
44
            root.maximizeClicked();
44
            root.maximizeClicked();
62
45
        }
45
        }
63
46
    }
46
    }
64
@@ -77,9 +77,8 @@
65
77
            onCloseClicked: root.closeClicked();
77
            onCloseClicked: root.closeClicked();
66
78
            onMinimizeClicked: root.minimizeClicked();
78
            onMinimizeClicked: root.minimizeClicked();
67
79
            onMaximizeClicked: root.maximizeClicked();
79
            onMaximizeClicked: root.maximizeClicked();
71
80
            onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
80
            onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();
72
81
            onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
81
            onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();
70
82
            closeButtonShown: root.target.appId !== "unity8-dash"
73
83
        }
82
        }
74
84
83
75
85
        Label {
84
        Label {
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