git.iko.soy/unity8
on xenial help sign in
Merge from surfaceItemFillMode
commit830d646b0ce6232a9b0a88c2a2118165df06420c authorMichael Terry <michael.terry@canonical.com> dateThu 3 Dec 2015, 14:36 (11 years ago) parentc6ccdb769e4829
3 files changed+14
compare with xenial
unifiedsplit
qml/Stages/SurfaceContainer.qml+1 tests/mocks/Unity/Application/MirSurfaceItem.cpp+8 tests/mocks/Unity/Application/MirSurfaceItem.h+5
qml/Stages/SurfaceContainer.qml+1
@@ -55,6 +55,7 @@ FocusScope {
5555 id: surfaceItem
5656 objectName: "surfaceItem"
5757
58+ fillMode: MirSurfaceItem.PadOrCrop
5859 consumesInput: true
5960
6061 surfaceWidth: {
tests/mocks/Unity/Application/MirSurfaceItem.cpp+8
@@ -305,3 +305,11 @@ void MirSurfaceItem::updateSurfaceSize()
305305 m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
306306 }
307307}
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:
6262 int surfaceHeight() const override;
6363 void setSurfaceHeight(int value) override;
6464
65+ FillMode fillMode() const override { return m_fillMode; }
66+ void setFillMode(FillMode value) override;
67+
6568 /////
6669 // For use in qml tests
6770
@@ -107,6 +110,8 @@ private:
107110 int m_touchPressCount;
108111 int m_touchReleaseCount;
109112
113+ FillMode m_fillMode{Stretch};
114+
110115 friend class SurfaceManager;
111116};
112117