lp:~gerboland/miral/add-interactivity-to-WM

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:miral at revision 271

Alan Griffiths: Approve on 2016-08-12

Diff: 2067 lines (+752/-431)

22 files modified

miral-qt/demos/qml-demo-shell/windowModel.qml (+104/-25)
miral-qt/src/common/windowcontrollerinterface.h (+53/-0)
miral-qt/src/common/windowmodelinterface.h (+36/-30)
miral-qt/src/modules/Unity/Application/mirsurface.cpp (+152/-124)
miral-qt/src/modules/Unity/Application/mirsurface.h (+12/-30)
miral-qt/src/modules/Unity/Application/mirsurfaceinterface.h (+1/-7)
miral-qt/src/modules/Unity/Application/mirsurfacemanager.cpp (+54/-54)
miral-qt/src/modules/Unity/Application/windowmodel.cpp (+43/-29)
miral-qt/src/modules/Unity/Application/windowmodel.h (+9/-2)
miral-qt/src/platforms/mirserver/CMakeLists.txt (+2/-0)
miral-qt/src/platforms/mirserver/mirserver.cpp (+3/-4)
miral-qt/src/platforms/mirserver/mirserver.h (+4/-2)
miral-qt/src/platforms/mirserver/qmirserver.cpp (+2/-2)
miral-qt/src/platforms/mirserver/windowcontroller.cpp (+85/-0)
miral-qt/src/platforms/mirserver/windowcontroller.h (+51/-0)
miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp (+48/-20)
miral-qt/src/platforms/mirserver/windowmanagementpolicy.h (+13/-8)
miral-qt/src/platforms/mirserver/windowmodel.cpp (+10/-26)
miral-qt/tests/framework/fake_mirsurface.cpp (+6/-4)
miral-qt/tests/framework/fake_mirsurface.h (+5/-10)
miral-qt/tests/modules/SurfaceManager/CMakeLists.txt (+3/-1)
miral-qt/tests/modules/SurfaceManager/mirsurface_test.cpp (+56/-53)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

268. By Gerry Boland on 2016-08-12

remove defunkt comment

267. By Gerry Boland on 2016-08-12

The | operator for QFlags not actually needed - yet! Remove, add back only when I need it

266. By Gerry Boland on 2016-08-12

ifdef the clang workaround

265. By Gerry Boland on 2016-08-11

Fix up MirSurface test to at least compile. Disable MirSurfaceItem test as functionality missing still

264. By Gerry Boland on 2016-08-10

Update FakeMirSurface to match the interface

263. By Gerry Boland on 2016-08-10

Silence warning by clang on vivid

262. By Gerry Boland on 2016-08-10

Merge miral trunk rev 267

261. By Gerry Boland on 2016-08-10

One more useful comment for consistency

260. By Gerry Boland on 2016-08-10

comment consistency

259. By Gerry Boland on 2016-08-10

Workaround window close crash - window null in MirSurface destructor