Merge lp:~lukas-kde/unity8/windowOpenCloseAnimations into lp:unity8

[Lukáš Tinkl]

WIP: window open/close animations in desktop stage

[lp:~lukas-kde/unity8/windowOpenCloseAnimations]

2111. By Lukáš Tinkl on 2016-01-11

fix maximized windows' closing animation

2112. By Lukáš Tinkl on 2016-01-11

fixup the failing test_windowClose()

need to wait for the anim to finish

2113. By Lukáš Tinkl on 2016-01-13

simplify the closeApplication() arguments

2114. By Lukáš Tinkl on 2016-01-13

settle on standard UbuntuNumberAnimation, looks much smoother

2115. By Lukáš Tinkl on 2016-01-15

merge trunk

2116. By Lukáš Tinkl on 2016-01-15

tune the closing animations to be a tad faster (as designed) and much smoother

2117. By Lukáš Tinkl on 2016-01-15

make the initial animation also a bit faster

2118. By Lukáš Tinkl on 2016-01-18

use the correct Reverse easing, pause the animation briefly before closing the app

2119. By Lukáš Tinkl on 2016-01-19

fix saving the state on closing (the delegate is no longer in maximized state)

2120. By Lukáš Tinkl on 2016-01-19

fix opacity and scale properties for apps that are started maximized

2121. By Lukáš Tinkl on 2016-01-19

fixup failing tests

2122. By Lukáš Tinkl on 2016-02-02

merge lp:~mzanetti/unity8/launcher-sizing

2123. By Nick Dedekind on 2016-02-10

fix disappearing windows

2124. By Lukáš Tinkl on 2016-02-10

merge prereq

2125. By Lukáš Tinkl on 2016-02-10

reevaluate the screen size by making it a binding

fixes tiny windows when switching stages

2126. By Lukáš Tinkl on 2016-02-10

drive just the appDelegate in states and transitions

2127. By Lukáš Tinkl on 2016-02-10

restore max states

2128. By Lukáš Tinkl on 2016-02-10

partial revert, turn the x/y coords into a binding as well
(they depend on screenWidth/Height too)

2129. By Lukáš Tinkl on 2016-02-10

simplify code, fix restoring maximized windows

2130. By Lukáš Tinkl on 2016-02-11

make close() a method of the delegate

2131. By Lukáš Tinkl on 2016-02-17

merge prereq, fix conflicts

2132. By Lukáš Tinkl on 2016-02-17

merge lp:~unity-team/unity8/launcher-sizing

2133. By Lukáš Tinkl on 2016-02-19

merge prereq

2134. By Lukáš Tinkl on 2016-02-24

merge trunk

2135. By Lukáš Tinkl on 2016-02-24

handle the close case coming from launcher

2136. By Lukáš Tinkl on 2016-02-24

fix the launcher ApplicationManager mock

2137. By Lukáš Tinkl on 2016-02-26

restart app if focusing doesn't work

happens with dash sometimes

2138. By Lukáš Tinkl on 2016-02-26

make the close animation testable using the App checkbox

2139. By Lukáš Tinkl on 2016-02-27

fix fullscreen apps being offset by the left margin

2140. By Lukáš Tinkl on 2016-02-27

disallow resizing windows up past the Panel

2141. By Lukáš Tinkl on 2016-02-28

fix closing animation for minimized apps

2142. By Lukáš Tinkl on 2016-02-29

fullscreen apps fix

2143. By Lukáš Tinkl on 2016-02-29

fix for fullscreen windows height

2144. By Lukáš Tinkl on 2016-03-06

merge lp:~mzanetti/unity8/launcher-sizing

2145. By Lukáš Tinkl on 2016-03-06

revert keymap (unrelated) changes

2146. By Lukáš Tinkl on 2016-03-06

depend on -15 appl framework

2147. By Lukáš Tinkl on 2016-03-06

implement maximizeHorizontally/Vertically

2148. By Lukáš Tinkl on 2016-03-07

requestStop() here

2149. By Lukáš Tinkl on 2016-03-07

save/restore the correct state in all cases

implement (easy now) maximize horizontal/vertical using it

2150. By Lukáš Tinkl on 2016-03-12

merge trunk

2151. By Lukáš Tinkl on 2016-03-21

merge trunk

2152. By Lukáš Tinkl on 2016-03-22

merge trunk

2153. By Lukáš Tinkl on 2016-03-24

merge trunk, resolve conflicts

2154. By Lukáš Tinkl on 2016-04-07

merge trunk

2155. By Lukáš Tinkl on 2016-04-14

merge trunk

Unmerged revisions

2155. By Lukáš Tinkl on 2016-04-14

merge trunk

2154. By Lukáš Tinkl on 2016-04-07

merge trunk

2153. By Lukáš Tinkl on 2016-03-24

merge trunk, resolve conflicts

2152. By Lukáš Tinkl on 2016-03-22

merge trunk

2151. By Lukáš Tinkl on 2016-03-21

merge trunk

2150. By Lukáš Tinkl on 2016-03-12

merge trunk

2149. By Lukáš Tinkl on 2016-03-07

save/restore the correct state in all cases

implement (easy now) maximize horizontal/vertical using it

2148. By Lukáš Tinkl on 2016-03-07

requestStop() here

2147. By Lukáš Tinkl on 2016-03-06

implement maximizeHorizontally/Vertically

2146. By Lukáš Tinkl on 2016-03-06

depend on -15 appl framework

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-11-30 17:27:47 +0000
+++ qml/Stages/DesktopStage.qml	2016-01-08 16:21:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,9 +55,8 @@
         }
 
         onFocusRequested: {
-            var appIndex = priv.indexOf(appId);
-            var appDelegate = appRepeater.itemAt(appIndex);
-            appDelegate.restore();
+            var delegate = priv.appDelegate(appId);
+            delegate.restore();
 
             if (spread.state == "altTab") {
                 spread.cancel();
@@ -68,7 +67,7 @@
     GlobalShortcut {
         id: closeWindowShortcut
         shortcut: Qt.AltModifier|Qt.Key_F4
-        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
+        onTriggered: priv.closeApplication(priv.focusedAppDelegate, priv.focusedAppId)
         active: priv.focusedAppId !== ""
     }
 
@@ -124,16 +123,20 @@
         onFocusedAppDelegateChanged: updateForegroundMaximizedApp();
 
         property int foregroundMaximizedAppZ: -1
+        property int foregroundMaximizedAppIndex: -1 // for stuff like drop shadow and focusing maximized app by clicking panel
 
         function updateForegroundMaximizedApp() {
             var tmp = -1;
+            var tmpAppId = -1;
             for (var i = appRepeater.count - 1; i >= 0; i--) {
                 var item = appRepeater.itemAt(i);
                 if (item && item.visuallyMaximized) {
+                    tmpAppId = i;
                     tmp = Math.max(tmp, item.normalZ);
                 }
             }
             foregroundMaximizedAppZ = tmp;
+            foregroundMaximizedAppIndex = tmpAppId;
         }
 
         function indexOf(appId) {
@@ -166,18 +169,30 @@
                 }
             }
         }
+
+        function appDelegate(appId) {
+            var appIndex = indexOf(appId);
+            return appRepeater.itemAt(appIndex);
+        }
+
+        function closeApplication(delegate, appId) {
+            var del = delegate || appDelegate(appId);
+            print("!!! initial delegate state", del.state)
+            del.state = "closing";
+            print("!!! target delegate state", del.state)
+        }
     }
 
     Connections {
         target: PanelState
         onClose: {
-            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
+            priv.closeApplication(priv.focusedAppDelegate, ApplicationManager.focusedApplicationId)
         }
         onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
         onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
                     && priv.focusedAppDelegate.restoreFromMaximized();
-        onFocusMaximizedApp: if (priv.foregroundMaximizedAppIdIndex != -1) {
-                                 ApplicationManager.focusApplication(appRepeater.itemAt(priv.foregroundMaximizedAppIdIndex).appId);
+        onFocusMaximizedApp: if (priv.foregroundMaximizedAppIndex != -1) {
+                                 ApplicationManager.focusApplication(appRepeater.itemAt(priv.foregroundMaximizedAppIndex).appId);
                              }
     }
 
@@ -206,7 +221,7 @@
     Binding {
         target: PanelState
         property: "dropShadow"
-        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppIdIndex !== -1
+        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppIndex !== -1
     }
 
     Component.onDestruction: {
@@ -335,6 +350,9 @@
 
                 states: [
                     State {
+                        name: "closing"
+                    },
+                    State {
                         name: "fullscreen"; when: decoratedWindow.fullscreen
                         extend: "maximized"
                         PropertyChanges {
@@ -389,14 +407,30 @@
                         to: "normal"
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
-                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight" }
+                        NumberAnimation {
+                            target: appDelegate
+                            property: 'scale'
+                            from: 0.85
+                            to: 1
+                            duration: UbuntuAnimation.SnapDuration
+                            easing: UbuntuAnimation.StandardEasing
+                        }
+                        NumberAnimation {
+                            target: appDelegate
+                            property: 'opacity'
+                            from: 0
+                            to: 1
+                            duration: UbuntuAnimation.SnapDuration
+                            easing: UbuntuAnimation.StandardEasing
+                        }
                     },
                     Transition {
                         to: "minimized"
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                         SequentialAnimation {
-                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale" }
                             PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                             ScriptAction {
                                 script: {
@@ -408,11 +442,39 @@
                         }
                     },
                     Transition {
+                        to: "closing"
+                        SequentialAnimation {
+                            ParallelAnimation {
+                                NumberAnimation {
+                                    target: appDelegate
+                                    property: 'scale'
+                                    from: 1
+                                    to: 0.85
+                                    duration: UbuntuAnimation.SnapDuration
+                                    easing: UbuntuAnimation.StandardEasingReverse
+                                }
+                                NumberAnimation {
+                                    target: appDelegate
+                                    property: 'opacity'
+                                    from: 1
+                                    to: 0
+                                    duration: UbuntuAnimation.SnapDuration
+                                    easing: UbuntuAnimation.StandardEasingReverse
+                                }
+                            }
+                            ScriptAction {
+                                script: {
+                                    ApplicationManager.stopApplication(appId);
+                                }
+                            }
+                        }
+                    },
+                    Transition {
                         to: "*" //maximized and fullscreen
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                         SequentialAnimation {
-                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale" }
                             PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                         }
                     }
@@ -448,7 +510,7 @@
                     active: ApplicationManager.focusedApplicationId === model.appId
                     focus: true
 
-                    onClose: ApplicationManager.stopApplication(model.appId)
+                    onClose: priv.closeApplication(appDelegate, model.appId)
                     onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
                                 ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
                     onMinimize: appDelegate.minimize()

=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-12-08 15:37:51 +0000
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-01-08 16:21:55 +0000
@@ -25,6 +25,7 @@
 import ".." // For EdgeBarrierControls
 import "../../../qml/Stages"
 import "../../../qml/Components"
+import "../../../qml/Components/PanelState"
 
 Item {
     id: root
@@ -500,5 +501,33 @@
             tryCompare(dialerAppDelegate, "visible", true);
             tryCompare(facebookAppDelegate, "visible", false);
         }
+
+        function test_dropShadow() {
+            killAllRunningApps();
+
+            // verify the drop shadow is not visible initially
+            verify(PanelState.dropShadow == false);
+
+            // start an app, maximize it
+            var facebookApp = startApplication("facebook-webapp");
+            var facebookAppDelegate = findChild(desktopStage, "appDelegate_facebook-webapp");
+            facebookAppDelegate.maximize();
+
+            // verify the drop shadow is still not visible
+            verify(PanelState.dropShadow == false);
+
+            // start a foreground app, not maximized
+            var dialerApp = startApplication("dialer-app");
+            var dialerAppDelegate = findChild(desktopStage, "appDelegate_dialer-app");
+
+            // verify the drop shadow becomes visible
+            verify(PanelState.dropShadow == true);
+
+            // close the maximized app
+            ApplicationManager.stopApplication("facebook-webapp");
+
+            // verify the drop shadow is gone
+            verify(PanelState.dropShadow == false);
+        }
     }
 }