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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-29 12:45:36 +0300 (Fri, 29 May 2009)
New Revision: 18539

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
Log:
fix legacy submenus again


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-29 08:51:18 UTC (rev 18538)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-29 09:45:36 UTC (rev 18539)
@@ -1,5 +1,9 @@
 2009-05-29  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
+	* matchbox/client-types/mb-wm-client-menu.c (mb_wm_client_menu_init):
+	Remove use of mb_wm_theme_get_title_xy and use a constant value to
+	make submenus usable again. Fixes: NB#117301. 
+
 	Apply patch from Laszlo Pere for NB#115253.
 
 	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-29 08:51:18 UTC (rev 18538)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-29 09:45:36 UTC (rev 18539)
@@ -5,6 +5,8 @@
 
   Kimmo:
   * Support functions for hildon-desktop's non-composited mode.
+  * Fixes: NB#117301 - Not able to select the view option from the menu in
+    calculator application
 
   Thomas:
   * Fixes: NB#117084 - System-modal windows lose focus if an app sends

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-29 08:51:18 UTC (rev 18538)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-05-29 09:45:36 UTC (rev 18539)
@@ -122,15 +122,22 @@
   }
   else
   {
-    gint title_x, title_y;
+    /* hard-coded due to NB#117301 --- violates the Layout Guide a bit,
+     * but otherwise submenus can be placed on top of the main menu, making
+     * them unusable. */
+    int title_x;
 
-    mb_wm_theme_get_title_xy (wm->theme, &title_x, &title_y);
+    if (wm->xdpy_width > wm->xdpy_height)
+      title_x = 2 * 112 + 45;
+    else
+      /* portrait orientation */
+      title_x = 112 + 45;
 
     if (geom.x < title_x)
       geom.x = title_x;
 
-    if (geom.y < title_y)
-      geom.y = title_y;
+    if (geom.y < 56)
+      geom.y = 56;
   }
 
   g_debug ("%s: Menu will be at %d %d %d %d", __func__, geom.x, geom.y,