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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-05-08 20:33:26 +0300 (Fri, 08 May 2009)
New Revision: 18299

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c
Log:
	NB#106650: ROTATION: HildonAppMenu is too narrow in portrait
	* matchbox/client-types/mb-wm-client-menu.c: in portrait mode,
	menus take up the whole width of the screen.  Fixes NB#106650.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-08 11:48:44 UTC (rev 18298)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-08 17:33:26 UTC (rev 18299)
@@ -1,3 +1,10 @@
+2009-05-08  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+	
+	NB#106650: ROTATION: HildonAppMenu is too narrow in portrait
+
+	* matchbox/client-types/mb-wm-client-menu.c: in portrait mode,
+	menus take up the whole width of the screen.  Fixes NB#106650.
+
 2009-05-08  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	Regression fix.  We died when the transient-for was unmapped then

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-08 11:48:44 UTC (rev 18298)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-menu.c	2009-05-08 17:33:26 UTC (rev 18299)
@@ -104,9 +104,21 @@
       != MBWMClientTypeMenu)
   {
     /* new-style menu */
-    geom.width = wm->xdpy_width - 100;
-    geom.x = wm->xdpy_width / 2 - geom.width / 2;
+
     geom.y = 0;
+
+    if (wm->xdpy_width > wm->xdpy_height)
+      {
+	/* Landscape mode: menu has a gutter either side */
+	geom.width = wm->xdpy_width - 100;
+	geom.x = wm->xdpy_width / 2 - geom.width / 2;
+      }
+    else
+      {
+	/* Portrait mode: menu takes up the full width */
+	geom.width = wm->xdpy_width;
+	geom.x = 0;
+      }
   }
   else
   {