git.iko.soy/unity8
on xenial help sign in
dashActive -> forceDashActive
commit1813285ffaa63a77738e5cad026ea9a81f6b15be authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 29 Sep 2014, 11:54 (12 years ago) parentf55a0dc
3 files changed+12−12
compare with xenial
unifiedsplit
qml/Shell.qml+1−1 tests/mocks/Unity/Application/ApplicationManager.cpp+8−8 tests/mocks/Unity/Application/ApplicationManager.h+3−3
qml/Shell.qml+1−1
@@ -130,7 +130,7 @@ Item {
130130
131131 Binding {
132132 target: ApplicationManager
133− property: "dashActive"
133+ property: "forceDashActive"
134134 value: launcher.shown || launcher.dashSwipe
135135 }
136136
tests/mocks/Unity/Application/ApplicationManager.cpp+8−8
@@ -43,7 +43,7 @@ ApplicationManager *ApplicationManager::singleton()
4343ApplicationManager::ApplicationManager(QObject *parent)
4444 : ApplicationManagerInterface(parent)
4545 , m_suspended(false)
46− , m_dashActive(false)
46+ , m_forceDashActive(false)
4747{
4848 m_roleNames.insert(RoleSession, "session");
4949 m_roleNames.insert(RoleFullscreen, "fullscreen");
@@ -293,20 +293,20 @@ void ApplicationManager::setSuspended(bool suspended)
293293 Q_EMIT suspendedChanged();
294294}
295295
296−bool ApplicationManager::dashActive() const
296+bool ApplicationManager::forceDashActive() const
297297{
298− return m_dashActive;
298+ return m_forceDashActive;
299299}
300300
301−void ApplicationManager::setDashActive(bool dashActive)
301+void ApplicationManager::setForceDashActive(bool forceDashActive)
302302{
303− if (m_dashActive == dashActive) {
303+ if (m_forceDashActive == forceDashActive) {
304304 return;
305305 }
306306
307307 ApplicationInfo *dash = findApplication("unity8-dash");
308308 if (dash) {
309− if (dashActive) {
309+ if (forceDashActive) {
310310 dash->setState(ApplicationInfo::Running);
311311 } else {
312312 if (!dash->focused()) {
@@ -314,8 +314,8 @@ void ApplicationManager::setDashActive(bool dashActive)
314314 }
315315 }
316316 }
317− m_dashActive = dashActive;
318− Q_EMIT dashActiveChanged();
317+ m_forceDashActive = forceDashActive;
318+ Q_EMIT forceDashActiveChanged();
319319}
320320
321321bool ApplicationManager::focusApplication(const QString &appId)
tests/mocks/Unity/Application/ApplicationManager.h+3−3
@@ -102,8 +102,8 @@ class ApplicationManager : public ApplicationManagerInterface {
102102 bool suspended() const override;
103103 void setSuspended(bool suspended) override;
104104
105− bool dashActive() const override;
106− void setDashActive(bool dashActive) override;
105+ bool forceDashActive() const override;
106+ void setForceDashActive(bool forceDashActive) override;
107107
108108 // Only for testing
109109 Q_INVOKABLE QStringList availableApplications();
@@ -127,7 +127,7 @@ class ApplicationManager : public ApplicationManagerInterface {
127127 void buildListOfAvailableApplications();
128128 void onWindowCreated();
129129 bool m_suspended;
130− bool m_dashActive;
130+ bool m_forceDashActive;
131131 QList<ApplicationInfo*> m_runningApplications;
132132 QList<ApplicationInfo*> m_availableApplications;
133133 QTimer m_windowCreatedTimer;