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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-06 16:13:47 +0300 (Thu, 06 Aug 2009)
New Revision: 19082

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
Log:
fix NB#130995


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-06 13:08:39 UTC (rev 19081)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-06 13:13:47 UTC (rev 19082)
@@ -1,3 +1,10 @@
+2009-08-06  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_realize):
+	Create a blocker for application windows as well, to block taps during
+	non-fullscreen/fullscreen transition when the window is unmapped for a
+	short period of time. Fixes: NB#130995
+
 2009-08-05  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.53

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-06 13:08:39 UTC (rev 19081)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-06 13:13:47 UTC (rev 19082)
@@ -1,6 +1,8 @@
 matchbox-window-manager-2 (0.2.54-1~unreleased) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * Fixes: NB#130995 - In certain scenario taps land on window below the
+    application
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed,  5 Aug 2009 10:38:21 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-08-06 13:08:39 UTC (rev 19081)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-08-06 13:13:47 UTC (rev 19082)
@@ -262,12 +262,17 @@
    * If this is a system-modal client and the global setting
    * is to support system modal windows, we create a
    * fullscreen, input-only window that gets stacked
-   * immediately bellow it, catching any input events that
+   * immediately below it, catching any input events that
    * fall outside of the system-modal client.
    */
-  if (mb_wm_client_is_modal (client) &&
+  if ((mb_wm_client_is_modal (client) &&
       !mb_wm_client_get_transient_for (client) &&
-      mb_wm_get_modality_type (wm) == MBWMModalitySystem)
+      mb_wm_get_modality_type (wm) == MBWMModalitySystem) ||
+      /* we create a blocker for application windows as well,
+       * to block taps during non-fullscreen/fullscreen transition when
+       * the window is unmapped for a short period of time */
+      client->window->net_type ==
+                wm->atoms[MBWM_ATOM_NET_WM_WINDOW_TYPE_NORMAL])
     {
       int d;