1dc9076 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

move minimized/maximized etc into a private object

1dc9076Michael Zanetti11 years ago

qml/Stages/DesktopStage.qml+30−22

compare with xenial

unifiedsplit

@@ -222,10 +222,18 @@ Rectangle {

222 height: units.gu(50)

223 focus: appId === priv.focusedAppId

224

225+ QtObject {

226+ id: appDelegatePrivate

225− property bool maximized: false

227+ property bool maximized: false

226− property bool maximizedLeft: false

228+ property bool maximizedLeft: false

227− property bool maximizedRight: false

229+ property bool maximizedRight: false

228− property bool minimized: false

230+ property bool minimized: false

231+ }

232+ readonly property alias maximized: appDelegatePrivate.maximized

233+ readonly property alias maximizedLeft: appDelegatePrivate.maximizedLeft

234+ readonly property alias maximizedRight: appDelegatePrivate.maximizedRight

235+ readonly property alias minimized: appDelegatePrivate.minimized

236+

229 readonly property string appId: model.appId

237 readonly property string appId: model.appId

230 property bool animationsEnabled: true

238 property bool animationsEnabled: true

231 property alias title: decoratedWindow.title

239 property alias title: decoratedWindow.title

@@ -249,37 +257,37 @@ Rectangle {

249

257

250 function maximize(animated) {

258 function maximize(animated) {

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

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

252− minimized = false;

260+ appDelegatePrivate.minimized = false;

253− maximized = true;

261+ appDelegatePrivate.maximized = true;

254− maximizedLeft = false;

262+ appDelegatePrivate.maximizedLeft = false;

255− maximizedRight = false;

263+ appDelegatePrivate.maximizedRight = false;

256 }

264 }

257 function maximizeLeft() {

265 function maximizeLeft() {

258− minimized = false;

266+ appDelegatePrivate.minimized = false;

259− maximized = false;

267+ appDelegatePrivate.maximized = false;

260− maximizedLeft = true;

268+ appDelegatePrivate.maximizedLeft = true;

261− maximizedRight = false;

269+ appDelegatePrivate.maximizedRight = false;

262 }

270 }

263 function maximizeRight() {

271 function maximizeRight() {

264− minimized = false;

272+ appDelegatePrivate.minimized = false;

265− maximized = false;

273+ appDelegatePrivate.maximized = false;

266− maximizedLeft = false;

274+ appDelegatePrivate.maximizedLeft = false;

267− maximizedRight = true;

275+ appDelegatePrivate.maximizedRight = true;

268 }

276 }

269 function minimize(animated) {

277 function minimize(animated) {

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

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

271− minimized = true;

279+ appDelegatePrivate.minimized = true;

272 }

280 }

273 function restore(animated) {

281 function restore(animated) {

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

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

275− minimized = false;

283+ appDelegatePrivate.minimized = false;

276− maximized = false;

284+ appDelegatePrivate.maximized = false;

277− maximizedLeft = false;

285+ appDelegatePrivate.maximizedLeft = false;

278− maximizedRight = false;

286+ appDelegatePrivate.maximizedRight = false;

279 }

287 }

280 function restoreFromMinimized(animated) {

288 function restoreFromMinimized(animated) {

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

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

282− minimized = false;

290+ appDelegatePrivate.minimized = false;

283 if (maximized)

291 if (maximized)

284 maximize();

292 maximize();

285 else if (maximizedLeft)

293 else if (maximizedLeft)