[maemo-commits] [maemo-commits] r12248 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-12 13:24:09 +0300 (Tue, 12 Jun 2007)
New Revision: 12248

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
Log:

2007-06-12  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-area.c:
	- Allow add without layout



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-12 08:31:58 UTC (rev 12247)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-12 10:24:09 UTC (rev 12248)
@@ -1,3 +1,13 @@
+2007-06-12  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c:
+	- Allow add without layout
+
+2007-06-12  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-titlebar.c:
+	- reduced size of the menu button. Fixes: NB#58138
+
 2007-06-12  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-applications-menu.c:
@@ -30,7 +40,7 @@
 
 	* src/hd-home-background-dialog.c:
 	- remove extension and .sketch from image name
-	Fixes: NB#56712
+	Fixes: NB#56712, NB#54030
 
 2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-12 08:31:58 UTC (rev 12247)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-12 10:24:09 UTC (rev 12248)
@@ -913,14 +913,18 @@
       return;
     }
 
-  if (priv->layout && HILDON_DESKTOP_IS_HOME_ITEM (applet))
+  if (HILDON_DESKTOP_IS_HOME_ITEM (applet))
     {
-      GdkRectangle *rect;
-      const gchar *name = hildon_desktop_item_get_id (
-                                     HILDON_DESKTOP_ITEM (applet));
+      GdkRectangle *rect = NULL;
 
-      rect = g_hash_table_lookup (priv->layout, name);
+      if (priv->layout)
+        {
+          const gchar *name =
+              hildon_desktop_item_get_id (HILDON_DESKTOP_ITEM (applet));
 
+          rect = g_hash_table_lookup (priv->layout, name);
+        }
+
       if (rect)
         {
           hildon_home_area_put (HILDON_HOME_AREA (area),
@@ -934,6 +938,7 @@
         {
           hildon_home_area_put (HILDON_HOME_AREA (area), applet, 0, 0);
         }
+    }
 
       g_signal_emit_by_name (area, "layout-changed");
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-06-12 08:31:58 UTC (rev 12247)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-06-12 10:24:09 UTC (rev 12248)
@@ -56,10 +56,10 @@
 #define HILDON_HOME_TITLEBAR_MENU_LABEL_FONT  "osso-TitleFont"
 #define HILDON_HOME_TITLEBAR_MENU_LABEL_COLOR "TitleTextColor"
 
-#define HILDON_HOME_MENUAREA_LMARGIN    0
-#define HILDON_HOME_MENUAREA_WIDTH      348
+#define HILDON_HOME_MENUAREA_LMARGIN    6
+#define HILDON_HOME_MENUAREA_WIDTH      312
 
-#define HILDON_HOME_MENU_WIDTH          348
+#define HILDON_HOME_MENU_WIDTH          312
 
 #define PADDING_TOP  12
 #define PADDING_LEFT 35