git.iko.soy/unity8
on xenial help sign in
animate panel earlier
4ae044aMichael Zanetti
qml/Shell.qml+3−5
compare with xenial
unifiedsplit
@@ -120,7 +120,6 @@ FocusScope {
120 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
120 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
121
121
122 readonly property bool applicationRunning: ApplicationManager.focusedApplicationId.length > 0
122 readonly property bool applicationRunning: ApplicationManager.focusedApplicationId.length > 0
123− onApplicationRunningChanged: print("***************+ application running", applicationRunning)
124
123
125 // Whether the user should see the topmost application surface (if there's one at all).
124 // Whether the user should see the topmost application surface (if there's one at all).
126 readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.painting
125 readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.painting
@@ -129,9 +128,6 @@ FocusScope {
129 // through the translucent parts of the shell surface.
128 // through the translucent parts of the shell surface.
130 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
129 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
131
130
132− onVisibleChanged: print("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", visible, fullyCovered, applicationSurfaceShouldBeSeen,
133− applicationRunning, stages.fullyHidden, stages.painting)
134−
135 CrossFadeImage {
131 CrossFadeImage {
136 id: backgroundImage
132 id: backgroundImage
137 objectName: "backgroundImage"
133 objectName: "backgroundImage"
@@ -197,6 +193,7 @@ FocusScope {
197 property bool fullyHidden: !shown && x == width
193 property bool fullyHidden: !shown && x == width
198
194
199 property bool painting: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.painting : false
195 property bool painting: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.painting : false
196+ property bool fullscreen: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.fullscreen : false
200
197
201 available: !greeter.shown
198 available: !greeter.shown
202 hides: [panel.indicators]
199 hides: [panel.indicators]
@@ -436,7 +433,8 @@ FocusScope {
436 }
433 }
437 property string focusedAppId: ApplicationManager.focusedApplicationId
434 property string focusedAppId: ApplicationManager.focusedApplicationId
438 property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
435 property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
436+ fullscreenMode: stages.painting ? stages.fullscreen :
439− fullscreenMode: focusedApplication && focusedApplication.fullscreen && !greeter.shown && !lockscreen.shown
437+ focusedApplication && focusedApplication.fullscreen && !greeter.shown && !lockscreen.shown
440 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
438 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
441
439
442 InputFilterArea {
440 InputFilterArea {
qml/Stages/PhoneStage.qml+6−5
@@ -18,8 +18,8 @@ Item {
18 property int dragAreaWidth
18 property int dragAreaWidth
19
19
20 // State information propagated to the outside
20 // State information propagated to the outside
21− readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible
21+ readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible || spreadView.visible
22− onPaintingChanged: print("**********************+ painting changed", painting)
22+ property bool fullscreen: ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
23
23
24 onMovingChanged: {
24 onMovingChanged: {
25 if (moving) {
25 if (moving) {
@@ -92,6 +92,7 @@ Item {
92
92
93 function switchToApp(appId) {
93 function switchToApp(appId) {
94 priv.newFocusedAppId = appId;
94 priv.newFocusedAppId = appId;
95+ root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
95 applicationSwitchingAnimation.start();
96 applicationSwitchingAnimation.start();
96 }
97 }
97
98
@@ -307,7 +308,7 @@ Item {
307 }
308 }
308 function snapTo(index) {
309 function snapTo(index) {
309 spreadView.selectedIndex = index;
310 spreadView.selectedIndex = index;
310−
311+ root.fullscreen = ApplicationManager.get(index).fullscreen;
311 snapAnimation.targetContentX = -shift;
312 snapAnimation.targetContentX = -shift;
312 snapAnimation.start();
313 snapAnimation.start();
313 }
314 }
@@ -320,8 +321,8 @@ Item {
320 target: spreadView
321 target: spreadView
321 property: "contentX"
322 property: "contentX"
322 to: snapAnimation.targetContentX
323 to: snapAnimation.targetContentX
323−// duration: UbuntuAnimation.FastDuration
324+ duration: UbuntuAnimation.FastDuration
324− duration: UbuntuAnimation.SleepyDuration
325+// duration: UbuntuAnimation.SleepyDuration
325 }
326 }
326 ScriptAction {
327 ScriptAction {
327 script: {
328 script: {