375fe27 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

There's no need for WindowDecoration to access the appDelegate

375fe27Daniel d'Andrada10 years ago

qml/Stage/DecoratedWindow.qml+1−1

compare with xenial

unifiedsplit

@@ -149,7 +149,7 @@ FocusScope {

149

150 WindowDecoration {

151 id: decoration

152− target: root.parent || null

152+ closeButtonVisible: root.application.appId !== "unity8-dash"

153 objectName: "appWindowDecoration"

154 anchors { left: parent.left; top: parent.top; right: parent.right }

155 height: units.gu(3)

qml/Stage/Stage.qml+15−3

@@ -1467,9 +1467,21 @@ FocusScope {

1467 onRequestedHeightChanged: oldRequestedHeight = requestedHeight

1468

1469 onCloseClicked: { appDelegate.close(); }

1470+ onMaximizeClicked: {

1471+ if (appDelegate.canBeMaximized) {

1470− onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();

1472+ appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();

1473+ }

1474+ }

1475+ onMaximizeHorizontallyClicked: {

1476+ if (appDelegate.canBeMaximizedHorizontally) {

1471− onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()

1477+ appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()

1478+ }

1479+ }

1480+ onMaximizeVerticallyClicked: {

1481+ if (appDelegate.canBeMaximizedVertically) {

1472− onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()

1482+ appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()

1483+ }

1484+ }

1473 onMinimizeClicked: appDelegate.minimize()

1485 onMinimizeClicked: appDelegate.minimize()

1474 onDecorationPressed: { appDelegate.focus = true; }

1486 onDecorationPressed: { appDelegate.focus = true; }

1475 onDecorationReleased: fakeRectangle.commit();

1487 onDecorationReleased: fakeRectangle.commit();

qml/Stage/WindowDecoration.qml+5−5

@@ -22,7 +22,7 @@ MouseArea {

22 id: root

23 clip: true

25− property Item target // appDelegate

25+ property bool closeButtonVisible

26 property alias title: titleLabel.text

27 property alias maximizeButtonShown: buttons.maximizeButtonShown

28 property bool active: false

@@ -40,7 +40,7 @@ MouseArea {

40 signal maximizeVerticallyClicked()

42 onDoubleClicked: {

43− if (target.canBeMaximized && mouse.button == Qt.LeftButton) {

43+ if (mouse.button == Qt.LeftButton) {

44 root.maximizeClicked();

45 }

46 }

@@ -77,9 +77,9 @@ MouseArea {

77 onCloseClicked: root.closeClicked();

78 onMinimizeClicked: root.minimizeClicked();

79 onMaximizeClicked: root.maximizeClicked();

80− onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();

80+ onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();

81− onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();

81+ onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();

82− closeButtonShown: root.target.appId !== "unity8-dash"

82+ closeButtonShown: root.closeButtonVisible

83 }

85 Label {