← Back to branch summary

~dandrader/qtmir/surfaceDrawn

~dandrader/qtmir/surfaceDrawn

« back to all changes in this revision

Viewing changes to tests/framework/fake_mirsurface.h

Committer: CI Train Bot
Author(s): Gerry Boland, Michał Sawicz, Nick Dedekind
Date: 2016-04-29 20:04:51 UTC
mfrom: (434.5.64 set-display-config)
Revision ID: ci-train-bot@canonical.com-20160429200451-v0bjc4pcypynt83b

Enhance ScreenController & the DisplayConfigurationPolicy to implement dynamic grid units.

- Rename ScreenController to ScreenModel, as it just reflects current screen state, does not offer means to configure it
- ScreenController can update state of existing Screens, based on Mir DisplayConfiguration changes.
- Expand Screen to include scale & form factor properties, with getter/notifier in NativeInterface. This enables the dynamic grid units in the shell
- Add a Unity.Screens qml module to give QML better information about connected screens, and allow basic reconfiguring.
- Implement a basic display configuration policy to set suitable scale and form factor on an external display (needed for dynamic grid units) Fixes: #1573532
Approved by: Unity8 CI Bot, Daniel d'Andrada

files added:
demos/qml-demo-shell/Button.qml

src/modules/Unity/Screens/qquickscreenwindow.cpp

src/modules/Unity/Screens/qquickscreenwindow.h

src/platforms/mirserver/customscreenconfiguration.h

src/platforms/mirserver/screenscontroller.cpp

src/platforms/mirserver/screenscontroller.h

tests/mirserver/ScreensModel/stub_displayconfigurationcontroller.h

files renamed:
src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp => src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/tileddisplayconfigurationpolicy.h => src/platforms/mirserver/mirdisplayconfigurationpolicy.h

src/platforms/mirserver/screencontroller.cpp => src/platforms/mirserver/screensmodel.cpp

src/platforms/mirserver/screencontroller.h => src/platforms/mirserver/screensmodel.h

tests/mirserver/ScreenController/ => tests/mirserver/ScreensModel/

tests/mirserver/ScreenController/screencontroller_test.cpp => tests/mirserver/ScreensModel/screensmodel_test.cpp

tests/mirserver/ScreenController/testable_screencontroller.h => tests/mirserver/ScreensModel/testable_screensmodel.h

files modified:
demos/qml-demo-shell/qml-demo-shell.qml

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/screenwindow.h

tests/framework/fake_mirsurface.h

tests/framework/qtmir_test.cpp

tests/mirserver/CMakeLists.txt

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/ScreensModel/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

tests/framework/fake_mirsurface.h

87

87

Q_EMIT closeRequested();

88

88

}

89

89

90

void setScreen(QScreen *) override {}

91

90

92

void raise() override {}

91

93

92

94

////

Older »