Merge lp:~saviq/unity-2d/reset-windowinfo-on-close into lp:unity-2d

[Michał Sawicz]

[lib] reset WindowInfo when the window in question closes

[Albert Astals Cid (aacid)]

Double newline after WindowInfo::onWindowClosed(), one too many ;-)

review: Needs Fixing

[Paweł Stołowski (stolowski)]

WindowInfo::updateGeometry can be simplified: assign x = y = w = h = 0 in the if (m_wnckWindow == NULL) clause, and move m_position and m_size assignments outside of the if-else block (will remove duplicated m_size/m_position setting code).

Alternatively, move int x, y, w, h to the 'else' block, as it's not needed in m_wnckWindow == NULL block.

review: Needs Fixing

[Michał Sawicz (saviq)]

Both fixed.

[Paweł Stołowski (stolowski)]

Looks good!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/186/console reported an error when processing this lp:~saviq/unity-2d/reset-windowinfo-on-close branch.
Not merging it.

=== modified file 'libunity-2d-private/src/windowinfo.cpp'
--- libunity-2d-private/src/windowinfo.cpp	2012-01-03 10:44:11 +0000
+++ libunity-2d-private/src/windowinfo.cpp	2012-03-09 14:12:19 +0000
@@ -104,6 +104,22 @@
         return;
     }
 
+    if (contentXid == 0) {
+        m_contentXid = 0;
+        m_decoratedXid = 0;
+        m_bamfApplication = NULL;
+        m_bamfWindow = NULL;
+        m_wnckWindow = NULL;
+        Q_EMIT contentXidChanged(m_contentXid);
+        Q_EMIT decoratedXidChanged(m_decoratedXid);
+        Q_EMIT zChanged(z());
+        Q_EMIT titleChanged(title());
+        Q_EMIT iconChanged(icon());
+        Q_EMIT desktopFileChanged(desktopFile());
+        Q_EMIT workspaceChanged(workspace());
+        return;
+    }
+
     /* First figure out what's the BamfApplication to which the content Xid
        belongs. However what we need is the actual BamfWindow, so we search
        for it among all the BamfWindows for that app. */
@@ -144,6 +160,7 @@
 
     g_signal_connect(G_OBJECT(m_wnckWindow), "workspace-changed",
                      G_CALLBACK(WindowInfo::onWorkspaceChanged), this);
+    connect(m_bamfWindow, SIGNAL(Closed()), this, SLOT(onWindowClosed()));
 
     Q_EMIT contentXidChanged(m_contentXid);
     Q_EMIT decoratedXidChanged(m_decoratedXid);
@@ -159,8 +176,10 @@
 
 void WindowInfo::setWorkspace(int workspaceNumber)
 {
-    WnckWorkspace* workspace = wnck_screen_get_workspace(wnck_screen_get_default(), workspaceNumber);
-    wnck_window_move_to_workspace(m_wnckWindow, workspace);
+    if (m_wnckWindow != NULL) {
+        WnckWorkspace* workspace = wnck_screen_get_workspace(wnck_screen_get_default(), workspaceNumber);
+        wnck_window_move_to_workspace(m_wnckWindow, workspace);
+    }
 }
 
 unsigned int WindowInfo::decoratedXid() const
@@ -181,15 +200,17 @@
 unsigned int WindowInfo::z() const
 {
     int z = 0;
-    GList *stack = wnck_screen_get_windows_stacked(wnck_screen_get_default());
-    GList *cur = stack;
-    while (cur) {
-        z++;
-        WnckWindow *window = (WnckWindow*) cur->data;
-        if (wnck_window_get_xid(window) == m_contentXid) {
-            break;
+    if (contentXid() != 0) {
+        GList *stack = wnck_screen_get_windows_stacked(wnck_screen_get_default());
+        GList *cur = stack;
+        while (cur) {
+            z++;
+            WnckWindow *window = (WnckWindow*) cur->data;
+            if (wnck_window_get_xid(window) == m_contentXid) {
+                break;
+            }
+            cur = g_list_next(cur);
         }
-        cur = g_list_next(cur);
     }
     return z;
 }
@@ -246,11 +267,20 @@
     showWindow(m_wnckWindow);
 }
 
+void WindowInfo::onWindowClosed()
+{
+    setContentXid(0);
+}
+
 void WindowInfo::updateGeometry()
 {
     int x, y, w, h;
 
-    wnck_window_get_geometry(m_wnckWindow, &x, &y, &w, &h);
+    if (m_wnckWindow == NULL) {
+        x = y = w = h = 0;
+    } else {
+        wnck_window_get_geometry(m_wnckWindow, &x, &y, &w, &h);
+    }
 
     m_position.setX(x);
     m_position.setY(y);
@@ -263,7 +293,9 @@
 
 void WindowInfo::showWindow(WnckWindow* window)
 {
-    wnck_window_activate(window, CurrentTime);
+    if (window != NULL) {
+        wnck_window_activate(window, CurrentTime);
+    }
 }
 
 bool WindowInfo::isSameBamfWindow(BamfWindow *other)

=== modified file 'libunity-2d-private/src/windowinfo.h'
--- libunity-2d-private/src/windowinfo.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/windowinfo.h	2012-03-09 14:12:19 +0000
@@ -103,6 +103,9 @@
     void desktopFileChanged(QString desktopFile);
     void workspaceChanged(int workspace);
 
+private Q_SLOTS:
+    void onWindowClosed();
+
 private:
     void updateGeometry();
     void updateWorkspace();