git.iko.soy/unity8
on xenial help sign in
removed enum
commit627da4a7a46372e887a5c94e5a67c4249620a413 authorNick Dedekind <nick.dedekind@canonical.com> dateWed 23 Sep 2015, 15:07 (11 years ago) parentf292b58
3 files changed+13−13
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/MirSurface.cpp+8−8 tests/mocks/Unity/Application/MirSurface.h+3−3 tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−2
tests/mocks/Unity/Application/MirSurface.cpp+8−8
@@ -31,7 +31,7 @@ MirSurface::MirSurface(const QString& name,
3131 , m_screenshotUrl(screenshot)
3232 , m_qmlFilePath(qmlFilePath)
3333 , m_live(true)
34− , m_visibility(Mir::Exposed)
34+ , m_visible(true)
3535 , m_viewCount(0)
3636 , m_activeFocus(false)
3737 , m_width(-1)
@@ -74,9 +74,9 @@ bool MirSurface::live() const
7474 return m_live;
7575}
7676
77−Mir::Visibility MirSurface::visibility() const
77+bool MirSurface::visible() const
7878{
79− return m_visibility;
79+ return m_visible;
8080}
8181
8282void MirSurface::setLive(bool live)
@@ -164,16 +164,16 @@ void MirSurface::setActiveFocus(bool value)
164164 Q_EMIT activeFocusChanged(value);
165165}
166166
167−void MirSurface::setVisibility(Mir::Visibility visibility)
167+void MirSurface::setVisible(bool visible)
168168{
169− qDebug() << "MirSurface::setVisibility(visibility=" << visibility << ")";
169+ qDebug() << "MirSurface::setVisible(visible=" << visible << ")";
170170
171− if (m_visibility == visibility)
171+ if (m_visible == visible)
172172 return;
173173
174− m_visibility = visibility;
174+ m_visible = visible;
175175
176− Q_EMIT visibilityChanged(m_visibility);
176+ Q_EMIT visibleChanged(m_visible);
177177}
178178
179179int MirSurface::width() const
tests/mocks/Unity/Application/MirSurface.h+3−3
@@ -58,7 +58,7 @@ public:
5858
5959 bool live() const override;
6060
61− Mir::Visibility visibility() const override;
61+ bool visible() const override;
6262
6363 Mir::OrientationAngle orientationAngle() const override;
6464 void setOrientationAngle(Mir::OrientationAngle) override;
@@ -86,7 +86,7 @@ public:
8686 bool activeFocus() const;
8787 void setActiveFocus(bool);
8888
89− void setVisibility(Mir::Visibility visibility);
89+ void setVisible(bool visible);
9090
9191Q_SIGNALS:
9292 void stateChanged(Mir::State);
@@ -108,7 +108,7 @@ private:
108108 QUrl m_screenshotUrl;
109109 QString m_qmlFilePath;
110110 bool m_live;
111− Mir::Visibility m_visibility;
111+ bool m_visible;
112112 int m_viewCount;
113113 bool m_activeFocus;
114114 int m_width;
tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−2
@@ -203,7 +203,7 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)
203203 m_qmlSurface->incrementViewCount();
204204
205205 m_qmlSurface->setActiveFocus(hasActiveFocus());
206− m_qmlSurface->setVisibility(isVisible() ? Mir::Exposed : Mir::Occluded);
206+ m_qmlSurface->setVisible(isVisible());
207207
208208 updateSurfaceSize();
209209
@@ -254,7 +254,7 @@ void MirSurfaceItem::itemChange(ItemChange change, const ItemChangeData & value)
254254 }
255255 } else if (change == QQuickItem::ItemVisibleHasChanged) {
256256 if (m_qmlSurface) {
257− m_qmlSurface->setVisibility(value.boolValue ? Mir::Exposed : Mir::Occluded);
257+ m_qmlSurface->setVisible(value.boolValue);
258258 }
259259 }
260260}