[maemo-commits] [maemo-commits] r18181 - in projects/haf/trunk/libmatchbox2: . matchbox/client-types

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-04-28 08:38:28 +0300 (Tue, 28 Apr 2009)
New Revision: 18181

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
Log:
        * matchbox/client-types/mb-wm-client-menu.c:
        Popup menus aren't restricted to appear to the right
        of a particular X coordinate.  Other kinds of menu
        still are.

        Fixes NB#101437.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-28 05:36:09 UTC (rev 18180)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-28 05:38:28 UTC (rev 18181)
@@ -1,3 +1,12 @@
+2009-04-28  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	* matchbox/client-types/mb-wm-client-menu.c:
+	Popup menus aren't restricted to appear to the right
+        of a particular X coordinate.  Other kinds of menu
+        still are.
+
+        Fixes NB#101437.
+
 2009-04-27  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.35

Modified: projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-04-28 05:36:09 UTC (rev 18180)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-04-28 05:38:28 UTC (rev 18181)
@@ -110,13 +110,16 @@
   }
   else
   {
-    if (geom.x < 112 * 2)
-        /* TODO: this should be dynamic, depending on status area.
-         * Also, submenus need to be handled differently */
-        geom.x = 112 * 2;
+    if (win->net_type != wm->atoms[MBWM_ATOM_NET_WM_WINDOW_TYPE_POPUP_MENU])
+      {
+	if (geom.x < 112 * 2)
+	  /* TODO: this should be dynamic, depending on status area.
+	   * Also, submenus need to be handled differently */
+	  geom.x = 112 * 2;
 
-    if (geom.y < 56)
-        geom.y = 56; /* shouldn't this be taken from the theme? */
+	if (geom.y < 56)
+	  geom.y = 56; /* shouldn't this be taken from the theme? */
+      }
   }
 
   g_debug ("%s: Menu will be at %d %d %d %d", __func__, geom.x, geom.y,