git.iko.soy/unity8
on xenial help sign in
animate panel earlier
commit4ae044a947df6c120173e2facd2979585e6349bc authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 4 Feb 2014, 13:46 (13 years ago) parent853451c
2 files changed+9−10
compare with xenial
unifiedsplit
qml/Shell.qml+3−5 qml/Stages/PhoneStage.qml+6−5
qml/Shell.qml+3−5
@@ -120,7 +120,6 @@ FocusScope {
120120 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
121121
122122 readonly property bool applicationRunning: ApplicationManager.focusedApplicationId.length > 0
123− onApplicationRunningChanged: print("***************+ application running", applicationRunning)
124123
125124 // Whether the user should see the topmost application surface (if there's one at all).
126125 readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.painting
@@ -129,9 +128,6 @@ FocusScope {
129128 // through the translucent parts of the shell surface.
130129 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
131130
132− onVisibleChanged: print("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", visible, fullyCovered, applicationSurfaceShouldBeSeen,
133− applicationRunning, stages.fullyHidden, stages.painting)
134−
135131 CrossFadeImage {
136132 id: backgroundImage
137133 objectName: "backgroundImage"
@@ -197,6 +193,7 @@ FocusScope {
197193 property bool fullyHidden: !shown && x == width
198194
199195 property bool painting: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.painting : false
196+ property bool fullscreen: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.fullscreen : false
200197
201198 available: !greeter.shown
202199 hides: [panel.indicators]
@@ -436,7 +433,8 @@ FocusScope {
436433 }
437434 property string focusedAppId: ApplicationManager.focusedApplicationId
438435 property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
439− fullscreenMode: focusedApplication && focusedApplication.fullscreen && !greeter.shown && !lockscreen.shown
436+ fullscreenMode: stages.painting ? stages.fullscreen :
437+ focusedApplication && focusedApplication.fullscreen && !greeter.shown && !lockscreen.shown
440438 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
441439
442440 InputFilterArea {
qml/Stages/PhoneStage.qml+6−5
@@ -18,8 +18,8 @@ Item {
1818 property int dragAreaWidth
1919
2020 // State information propagated to the outside
21− readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible
22− onPaintingChanged: print("**********************+ painting changed", painting)
21+ readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible || spreadView.visible
22+ property bool fullscreen: ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
2323
2424 onMovingChanged: {
2525 if (moving) {
@@ -92,6 +92,7 @@ Item {
9292
9393 function switchToApp(appId) {
9494 priv.newFocusedAppId = appId;
95+ root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
9596 applicationSwitchingAnimation.start();
9697 }
9798
@@ -307,7 +308,7 @@ Item {
307308 }
308309 function snapTo(index) {
309310 spreadView.selectedIndex = index;
310−
311+ root.fullscreen = ApplicationManager.get(index).fullscreen;
311312 snapAnimation.targetContentX = -shift;
312313 snapAnimation.start();
313314 }
@@ -320,8 +321,8 @@ Item {
320321 target: spreadView
321322 property: "contentX"
322323 to: snapAnimation.targetContentX
323−// duration: UbuntuAnimation.FastDuration
324− duration: UbuntuAnimation.SleepyDuration
324+ duration: UbuntuAnimation.FastDuration
325+// duration: UbuntuAnimation.SleepyDuration
325326 }
326327 ScriptAction {
327328 script: {