2489718 · unity8 · git.iko.soy

git.iko.soy/unity8

use maximise as unmaximise if already maximised

commit24897183d63c950a2046fbafb4fe9a5c77bdb5c2 authorNick Dedekind <nick.dedekind@canonical.com> dateFri 30 Oct 2015, 10:46 (11 years ago) parent5084e24

2 files changed+8−6

compare with xenial

unifiedsplit

qml/Stages/DesktopStage.qml+1−1 tests/qmltests/Stages/tst_DesktopStage.qml+7−5

qml/Stages/DesktopStage.qml+1−1

@@ -290,7 +290,7 @@ AbstractStage {

290290 focus: true

291291

292292 onClose: ApplicationManager.stopApplication(model.appId)

293− onMaximize: appDelegate.maximize()

293+ onMaximize: appDelegate.maximized ? appDelegate.unmaximize() : appDelegate.maximize()

294294 onMinimize: appDelegate.minimize()

295295 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }

296296 }

tests/qmltests/Stages/tst_DesktopStage.qml+7−5

@@ -221,7 +221,7 @@ Item {

221221 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");

222222 verify(dashDelegate);

223223

224− dashDelegate.minimize();

224+ findChild(dashDelegate, "decoratedWindow").minimize();

225225 tryCompare(dashApp.session.surface, "visible", false);

226226 }

227227

@@ -237,13 +237,15 @@ Item {

237237 var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");

238238 verify(cameraDelegate);

239239

240− dialerDelegate.maximize();

240+ // maximize

241+ findChild(dialerDelegate, "decoratedWindow").maximize();

241242 tryCompare(dialerDelegate, "visuallyMaximized", true);

242243

243244 tryCompare(dashApp.session.surface, "visible", false);

244245 compare(cameraApp.session.surface.visible, true);

245246

246− dialerDelegate.unmaximize();

247+ // restore

248+ findChild(dialerDelegate, "decoratedWindow").maximize();

247249 compare(dashApp.session.surface.visible, true);

248250 compare(cameraApp.session.surface.visible, true);

249251 }

@@ -260,12 +262,12 @@ Item {

260262 var cameraApp = startApplication("camera-app");

261263 var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");

262264 verify(cameraDelegate);

263− dialerDelegate.maximize();

265+ findChild(dialerDelegate, "decoratedWindow").maximize();

264266

265267 var galleryApp = startApplication("gallery-app");

266268 var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");

267269 verify(galleryDelegate);

268− galleryDelegate.maximize();

270+ findChild(galleryDelegate, "decoratedWindow").maximize();

269271

270272 tryCompare(dialerDelegate, "visuallyMaximized", true);

271273 tryCompare(galleryDelegate, "visuallyMaximized", true);