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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-07 15:05:53 +0300 (Thu, 07 May 2009)
New Revision: 18285

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
Log:
fixes to legacy menu layouting + remove support for negative menu coordinates


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-07 11:35:38 UTC (rev 18284)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-07 12:05:53 UTC (rev 18285)
@@ -1,3 +1,9 @@
+2009-05-07  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/client-types/mb-wm-client-menu.c: Remove the negative
+	coordinates code, it's not going to happen. Some fixes to Thomas'
+	legacy menu layouting.
+
 2009-05-06  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	NB#111652 legacy widget : application menu is not horizontally

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-05-07 11:35:38 UTC (rev 18284)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-05-07 12:05:53 UTC (rev 18285)
@@ -108,34 +108,14 @@
     geom.x = wm->xdpy_width / 2 - geom.width / 2;
     geom.y = 0;
   }
-  else if (geom.x < 0 && geom.y < 0) /* magic marker for
-                                        legacy application menu */
+  else
   {
     gint title_x, title_y;
-    const gint menu_left_gutter = 23;
 
-    geom.x += wm->xdpy_width;
-    geom.y += wm->xdpy_height;
-
     mb_wm_theme_get_title_xy (wm->theme, &title_x, &title_y);
-	
-    if (geom.x < title_x)
-      geom.x = title_x - menu_left_gutter;
 
-    if (geom.y < title_y)
-      geom.y = title_y;
-  }
-  else /* FIXME: remove this else branch after the widget side does
-          negative coordinates for legacy application menus,
-          see NB#101437 */
-  {
-    gint title_x, title_y;
-    const gint menu_left_gutter = 23;
-
-    mb_wm_theme_get_title_xy (wm->theme, &title_x, &title_y);
-
     if (geom.x < title_x)
-      geom.x = title_x - menu_left_gutter;
+      geom.x = title_x;
 
     if (geom.y < title_y)
       geom.y = title_y;