git.iko.soy/unity8
on xenial help sign in
MirSurfaceItem got a new property: fillMode
dc6e024Daniel d'Andrada
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=11)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)
61
61
62# Standard install paths
62# Standard install paths
63include(GNUInstallDirs)
63include(GNUInstallDirs)
debian/control+3−3
@@ -29,7 +29,7 @@ Build-Depends: cmake,
29 libqt5xmlpatterns5-dev,
29 libqt5xmlpatterns5-dev,
30 libsystemsettings-dev,
30 libsystemsettings-dev,
31 libudev-dev,
31 libudev-dev,
32− libunity-api-dev (>= 7.103),
32+ libunity-api-dev (>= 7.104),
33 libusermetricsoutput1-dev,
33 libusermetricsoutput1-dev,
34 libxcb1-dev,
34 libxcb1-dev,
35 pkg-config,
35 pkg-config,
@@ -128,7 +128,7 @@ Depends: qml-module-qtquick-layouts,
128 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
128 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
129 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
129 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
130 ubuntu-thumbnailer-impl-0,
130 ubuntu-thumbnailer-impl-0,
131− unity-application-impl-11,
131+ unity-application-impl-12,
132 unity-notifications-impl-3,
132 unity-notifications-impl-3,
133 unity-plugin-scopes | unity-scopes-impl,
133 unity-plugin-scopes | unity-scopes-impl,
134 unity-scopes-impl-7,
134 unity-scopes-impl-7,
@@ -174,7 +174,7 @@ Pre-Depends: ${misc:Pre-Depends},
174Depends: ${misc:Depends},
174Depends: ${misc:Depends},
175 ${shlibs:Depends},
175 ${shlibs:Depends},
176Provides: unity-application-impl,
176Provides: unity-application-impl,
177− unity-application-impl-11,
177+ unity-application-impl-12,
178Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
178Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
179Description: Fake environment for running Unity 8 shell
179Description: Fake environment for running Unity 8 shell
180 Provides fake implementations of some QML modules used by Unity 8 shell
180 Provides fake implementations of some QML modules used by Unity 8 shell
qml/Stages/SurfaceContainer.qml+1
@@ -55,6 +55,7 @@ FocusScope {
55 id: surfaceItem
55 id: surfaceItem
56 objectName: "surfaceItem"
56 objectName: "surfaceItem"
57
57
58+ fillMode: MirSurfaceItem.PadOrCrop
58 consumesInput: true
59 consumesInput: true
59
60
60 surfaceWidth: {
61 surfaceWidth: {
tests/mocks/Unity/Application/MirSurfaceItem.cpp+8
@@ -305,3 +305,11 @@ void MirSurfaceItem::updateSurfaceSize()
305 m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
305 m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
306 }
306 }
307}
307}
308+
309+void MirSurfaceItem::setFillMode(FillMode value)
310+{
311+ if (value != m_fillMode) {
312+ m_fillMode = value;
313+ Q_EMIT fillModeChanged(m_fillMode);
314+ }
315+}
tests/mocks/Unity/Application/MirSurfaceItem.h+5
@@ -62,6 +62,9 @@ public:
62 int surfaceHeight() const override;
62 int surfaceHeight() const override;
63 void setSurfaceHeight(int value) override;
63 void setSurfaceHeight(int value) override;
64
64
65+ FillMode fillMode() const override { return m_fillMode; }
66+ void setFillMode(FillMode value) override;
67+
65 /////
68 /////
66 // For use in qml tests
69 // For use in qml tests
67
70
@@ -107,6 +110,8 @@ private:
107 int m_touchPressCount;
110 int m_touchPressCount;
108 int m_touchReleaseCount;
111 int m_touchReleaseCount;
109
112
113+ FillMode m_fillMode;
114+
110 friend class SurfaceManager;
115 friend class SurfaceManager;
111};
116};
112
117