Merge lp:~gerboland/unity-mir/app-visible-property into lp:unity-mir

[Gerry Boland]

Add visible property to Application, so can show/hide all app surfaces

Add visible property to Application, so can show/hide all app surfaces

• Are there any related MPs required for this MP to build/function as expected?
No
• Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
• If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Unnecessary

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:181
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/116

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/253/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Works well! I need it!

review: Approve

[Daniel d'Andrada (dandrader)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2014-01-27 11:29:44 +0000
+++ src/modules/Unity/Application/application.cpp	2014-02-19 12:52:49 +0000
@@ -40,6 +40,7 @@
     , m_state(state)
     , m_focused(false)
     , m_fullscreen(false)
+    , m_visible(false)
     , m_arguments(arguments)
     , m_suspendTimer(new QTimer(this))
 {
@@ -125,6 +126,11 @@
     return m_session;
 }
 
+bool Application::visible() const
+{
+    return m_visible;
+}
+
 pid_t Application::pid() const
 {
     return m_pid;
@@ -141,6 +147,7 @@
 
     // TODO(greyback) what if called with new surface?
     m_session = session;
+    m_visible = true; // bit of an assumption that, but no other way to deduce an actual Surface has been created
 }
 
 void Application::setSessionName(const QString& name)
@@ -216,6 +223,21 @@
     }
 }
 
+void Application::setVisible(const bool visible)
+{
+    DLOG("Application::setVisible (this=%p, visible=%s)", this, visible ? "yes" : "no");
+    // FIXME: this is bad, as should a MirSurface of this app exist, it won't be notified of the visiblity change.
+    if (visible != m_visible) {
+        if (visible) {
+            m_session->show();
+        } else {
+            m_session->hide();
+        }
+        m_visible = visible;
+        Q_EMIT visibleChanged();
+    }
+}
+
 void Application::suspend()
 {
     DLOG("Application::suspend (this=%p)", this);

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2014-01-27 11:29:44 +0000
+++ src/modules/Unity/Application/application.h	2014-02-19 12:52:49 +0000
@@ -38,6 +38,7 @@
     Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
     Q_PROPERTY(QString exec READ exec CONSTANT)
     Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
+    Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
 
 public:
@@ -57,7 +58,10 @@
     State state() const override;
     bool focused() const override;
 
+    bool visible() const;
+
     void setStage(Stage stage);
+    void setVisible(const bool);
 
     bool isValid() const;
     QString desktopFile() const;
@@ -74,6 +78,7 @@
 Q_SIGNALS:
     void fullscreenChanged();
     void stageChanged(Stage stage);
+    void visibleChanged();
 
 private:
     void setPid(pid_t pid);
@@ -90,6 +95,7 @@
     State m_state;
     bool m_focused;
     bool m_fullscreen;
+    bool m_visible; // duplicating internal Mir data :(
     std::shared_ptr<mir::shell::Session> m_session;
     QString m_sessionName;
     QStringList m_arguments;