git.iko.soy/unity8
on xenial help sign in
Remove dependency on MirSurfaceItem.fillMode property
commit0b54e5a3c631fa5f06fa033eb13118b354229560 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 9 Nov 2015, 10:04 (11 years ago) parentf0b3fe3
3 files changed−20
compare with xenial
unifiedsplit
qml/Stages/SurfaceContainer.qml−1 tests/mocks/Unity/Application/MirSurfaceItem.cpp−14 tests/mocks/Unity/Application/MirSurfaceItem.h−5
qml/Stages/SurfaceContainer.qml−1
@@ -81,7 +81,6 @@ FocusScope {
8181 }
8282 }
8383
84− fillMode: root.resizeSurface ? MirSurfaceItem.PadOrCrop : MirSurfaceItem.Stretch
8584 enabled: root.interactive
8685 focus: true
8786 antialiasing: !root.interactive
tests/mocks/Unity/Application/MirSurfaceItem.cpp−14
@@ -37,7 +37,6 @@ MirSurfaceItem::MirSurfaceItem(QQuickItem *parent)
3737 , m_surfaceHeight(0)
3838 , m_touchPressCount(0)
3939 , m_touchReleaseCount(0)
40− , m_fillMode(Stretch)
4140{
4241// qDebug() << "MirSurfaceItem::MirSurfaceItem() " << (void*)(this) << name();
4342 setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |
@@ -306,16 +305,3 @@ void MirSurfaceItem::updateSurfaceSize()
306305 m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
307306 }
308307}
309−
310−MirSurfaceItem::FillMode MirSurfaceItem::fillMode() const
311−{
312− return m_fillMode;
313−}
314−
315−void MirSurfaceItem::setFillMode(FillMode value)
316−{
317− if (m_fillMode != value) {
318− m_fillMode = value;
319− Q_EMIT fillModeChanged(m_fillMode);
320− }
321−}
tests/mocks/Unity/Application/MirSurfaceItem.h−5
@@ -62,9 +62,6 @@ public:
6262 int surfaceHeight() const override;
6363 void setSurfaceHeight(int value) override;
6464
65− FillMode fillMode() const override;
66− void setFillMode(FillMode value) override;
67−
6865 /////
6966 // For use in qml tests
7067
@@ -110,8 +107,6 @@ private:
110107 int m_touchPressCount;
111108 int m_touchReleaseCount;
112109
113− FillMode m_fillMode;
114−
115110 friend class SurfaceManager;
116111};
117112