[maemo-commits] [maemo-commits] r18636 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-06-07 08:33:39 +0300 (Sun, 07 Jun 2009)
New Revision: 18636

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
Log:
	NB#120885: Animation actors steal focus when created.
	* matchbox/core/mb-window-manager.c: don't focus animation
	actors if they appear.
	* matchbox/core/mb-wm-atoms.c: add atom for animation actors.
	* matchbox/core/mb-wm-types.h: ditto.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-05 14:53:32 UTC (rev 18635)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-07 05:33:39 UTC (rev 18636)
@@ -1,3 +1,12 @@
+2009-06-07  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	NB#120885: Animation actors steal focus when created.
+
+	* matchbox/core/mb-window-manager.c: don't focus animation
+	actors if they appear.
+	* matchbox/core/mb-wm-atoms.c: add atom for animation actors.
+	* matchbox/core/mb-wm-types.h: ditto.
+
 2009-06-05  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/core/mb-wm-layout.c (mb_wm_layout_real_layout_free):

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-05 14:53:32 UTC (rev 18635)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-07 05:33:39 UTC (rev 18636)
@@ -1882,8 +1882,12 @@
     c_focus = last_focused_transient;
   }
 
-  mb_wm_focus_client (wm, c_focus);
-  mb_wm_client_stack (c, 0);
+  if (c->window->net_type==wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR]) {
+    g_debug ("Not focusing an animation actor.\n");
+  } else {
+    mb_wm_focus_client (wm, c_focus);
+    mb_wm_client_stack (c, 0);
+  }
 
   if (is_desktop != was_desktop)
     {

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-06-05 14:53:32 UTC (rev 18635)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-06-07 05:33:39 UTC (rev 18636)
@@ -104,6 +104,7 @@
     "_MB_SECONDARY",
     "_HILDON_STACKING_LAYER",
     "_HILDON_WM_NAME",
+    "_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR",
   };
 
   /* FIXME: Error Traps */

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-06-05 14:53:32 UTC (rev 18635)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-06-07 05:33:39 UTC (rev 18636)
@@ -298,6 +298,7 @@
   MBWM_ATOM_HILDON_STACKING_LAYER,
 
   MBWM_ATOM_HILDON_WM_NAME,
+  MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR,
 
   MBWM_ATOM_COUNT