Merge lp:~tiagosh/unity-2d/bugfix-897640 into lp:unity-2d

[Tiago Salem Herrmann]

When switching between workspaces we need to invalidade the previous active window, as it belongs
to the previous active workspace.

[Lohith D Shivamurthy (dyams)]

It works good and the code is neat and clean.

[Lohith D Shivamurthy (dyams)]

Thank you

review: Approve

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-12-07 19:20:54 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-12-08 19:46:25 +0000
@@ -28,6 +28,20 @@
 #include <debug_p.h>
 #include <config.h>
 
+// libwnck
+extern "C" {
+#include <libwnck/libwnck.h>
+}
+
+#define GOBJECT_CALLBACK0(callbackName, slot) \
+static void \
+callbackName(GObject* src, void* dummy1, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+GOBJECT_CALLBACK0(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
+
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
     QDeclarativeView(parent),
     m_useOpenGL(false),
@@ -40,6 +54,9 @@
         m_useOpenGL = unity2dConfiguration().property("useOpengl").toBool();
     }
 
+    WnckScreen* screen = wnck_screen_get_default();
+    g_signal_connect(G_OBJECT(screen), "active_workspace_changed", G_CALLBACK(activeWorkspaceChangedCB), this);
+
     setupViewport();
 }
 
@@ -243,4 +260,9 @@
     }
 }
 
+void Unity2DDeclarativeView::onActiveWorkspaceChanged() 
+{
+    m_last_focused_window = None;
+}
+
 #include <unity2ddeclarativeview.moc>

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2011-11-18 10:15:49 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-12-08 19:46:25 +0000
@@ -53,6 +53,9 @@
     void forceActivateWindow();
     void forceDeactivateWindow();
 
+private Q_SLOTS:
+    void onActiveWorkspaceChanged();
+
 private:
     void saveActiveWindow();
     void forceActivateThisWindow(WId);