4b513a5 · unity8 · git.iko.soy

on xenial help sign in

merge prereq

4b513a5Lukáš Tinkl11 years ago

qml/Stages/DesktopStage.qml+10−4

@@ -277,9 +277,6 @@ Rectangle {

277 function minimize(animated) {

278 animationsEnabled = (animated === undefined) || animated;

279 minimized = true;

280− if (!!animated) {

281− priv.focusNext();

282− }

283 }

280 }

284 function restore(animated) {

281 function restore(animated) {

285 animationsEnabled = (animated === undefined) || animated;

282 animationsEnabled = (animated === undefined) || animated;

@@ -327,7 +324,16 @@ Rectangle {

327 from: "maximized,maximizedLeft,maximizedRight,minimized,normal,"

324 from: "maximized,maximizedLeft,maximizedRight,minimized,normal,"

328 to: "maximized,maximizedLeft,maximizedRight,minimized,normal,"

325 to: "maximized,maximizedLeft,maximizedRight,minimized,normal,"

329 enabled: appDelegate.animationsEnabled

326 enabled: appDelegate.animationsEnabled

327+ SequentialAnimation {

330− PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }

328+ PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }

329+ ScriptAction {

330+ script: {

331+ if (animationsEnabled && state === "minimized" ) {

332+ priv.focusNext();

333+ }

334+ }

335+ }

336+ }

331 },

337 },

332 Transition {

338 Transition {

333 from: ""

339 from: ""