git.iko.soy/unity8
on xenial help sign in
removed enum
627da4aNick Dedekind
tests/mocks/Unity/Application/MirSurface.cpp+8−8
compare with xenial
unifiedsplit
@@ -31,7 +31,7 @@ MirSurface::MirSurface(const QString& name,
31 , m_screenshotUrl(screenshot)
31 , m_screenshotUrl(screenshot)
32 , m_qmlFilePath(qmlFilePath)
32 , m_qmlFilePath(qmlFilePath)
33 , m_live(true)
33 , m_live(true)
34− , m_visibility(Mir::Exposed)
34+ , m_visible(true)
35 , m_viewCount(0)
35 , m_viewCount(0)
36 , m_activeFocus(false)
36 , m_activeFocus(false)
37 , m_width(-1)
37 , m_width(-1)
@@ -74,9 +74,9 @@ bool MirSurface::live() const
74 return m_live;
74 return m_live;
75}
75}
76
76
77−Mir::Visibility MirSurface::visibility() const
77+bool MirSurface::visible() const
78{
78{
79− return m_visibility;
79+ return m_visible;
80}
80}
81
81
82void MirSurface::setLive(bool live)
82void MirSurface::setLive(bool live)
@@ -164,16 +164,16 @@ void MirSurface::setActiveFocus(bool value)
164 Q_EMIT activeFocusChanged(value);
164 Q_EMIT activeFocusChanged(value);
165}
165}
166
166
167−void MirSurface::setVisibility(Mir::Visibility visibility)
167+void MirSurface::setVisible(bool visible)
168{
168{
169− qDebug() << "MirSurface::setVisibility(visibility=" << visibility << ")";
169+ qDebug() << "MirSurface::setVisible(visible=" << visible << ")";
170
170
171− if (m_visibility == visibility)
171+ if (m_visible == visible)
172 return;
172 return;
173
173
174− m_visibility = visibility;
174+ m_visible = visible;
175
175
176− Q_EMIT visibilityChanged(m_visibility);
176+ Q_EMIT visibleChanged(m_visible);
177}
177}
178
178
179int MirSurface::width() const
179int MirSurface::width() const
tests/mocks/Unity/Application/MirSurface.h+3−3
@@ -58,7 +58,7 @@ public:
58
58
59 bool live() const override;
59 bool live() const override;
60
60
61− Mir::Visibility visibility() const override;
61+ bool visible() const override;
62
62
63 Mir::OrientationAngle orientationAngle() const override;
63 Mir::OrientationAngle orientationAngle() const override;
64 void setOrientationAngle(Mir::OrientationAngle) override;
64 void setOrientationAngle(Mir::OrientationAngle) override;
@@ -86,7 +86,7 @@ public:
86 bool activeFocus() const;
86 bool activeFocus() const;
87 void setActiveFocus(bool);
87 void setActiveFocus(bool);
88
88
89− void setVisibility(Mir::Visibility visibility);
89+ void setVisible(bool visible);
90
90
91Q_SIGNALS:
91Q_SIGNALS:
92 void stateChanged(Mir::State);
92 void stateChanged(Mir::State);
@@ -108,7 +108,7 @@ private:
108 QUrl m_screenshotUrl;
108 QUrl m_screenshotUrl;
109 QString m_qmlFilePath;
109 QString m_qmlFilePath;
110 bool m_live;
110 bool m_live;
111− Mir::Visibility m_visibility;
111+ bool m_visible;
112 int m_viewCount;
112 int m_viewCount;
113 bool m_activeFocus;
113 bool m_activeFocus;
114 int m_width;
114 int m_width;
tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−2
@@ -203,7 +203,7 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)
203 m_qmlSurface->incrementViewCount();
203 m_qmlSurface->incrementViewCount();
204
204
205 m_qmlSurface->setActiveFocus(hasActiveFocus());
205 m_qmlSurface->setActiveFocus(hasActiveFocus());
206− m_qmlSurface->setVisibility(isVisible() ? Mir::Exposed : Mir::Occluded);
206+ m_qmlSurface->setVisible(isVisible());
207
207
208 updateSurfaceSize();
208 updateSurfaceSize();
209
209
@@ -254,7 +254,7 @@ void MirSurfaceItem::itemChange(ItemChange change, const ItemChangeData & value)
254 }
254 }
255 } else if (change == QQuickItem::ItemVisibleHasChanged) {
255 } else if (change == QQuickItem::ItemVisibleHasChanged) {
256 if (m_qmlSurface) {
256 if (m_qmlSurface) {
257− m_qmlSurface->setVisibility(value.boolValue ? Mir::Exposed : Mir::Occluded);
257+ m_qmlSurface->setVisible(value.boolValue);
258 }
258 }
259 }
259 }
260}
260}