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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-28 19:37:58 +0300 (Mon, 28 May 2007)
New Revision: 11919

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
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-05-28  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-area.c:
	- emit "layout-changed" when applets are really added to the area
	* src/hd-home-window.c:
	- use "layout-changed" to know when to save the layout



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 15:50:59 UTC (rev 11918)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 16:37:58 UTC (rev 11919)
@@ -1,6 +1,13 @@
 2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-home-area.c:
+	- emit "layout-changed" when applets are really added to the area
+	* src/hd-home-window.c:
+	- use "layout-changed" to know when to save the layout
+
+2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c:
 	- do not add the padding to the layout saved
 	- disconnect the various handlers attached to the children
 	when they are removed

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-05-28 15:50:59 UTC (rev 11918)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-05-28 16:37:58 UTC (rev 11919)
@@ -750,7 +750,6 @@
   if (priv->batch_add)
     {
       priv->to_add = g_list_append (priv->to_add, applet);
-      g_signal_emit_by_name (area, "layout-changed");
       return;
     }
 
@@ -774,6 +773,8 @@
           gtk_fixed_put (GTK_FIXED (area), applet, 0, 0);
         }
 
+      g_signal_emit_by_name (area, "layout-changed");
+
       if (priv->layout_mode)
         hildon_desktop_home_item_set_layout_mode (HILDON_DESKTOP_HOME_ITEM (applet),
                                             TRUE);
@@ -1684,8 +1685,8 @@
             {
               GdkRectangle     *layout = create_rectangle (r->x,
                                                            r->y,
-                                                           -1,
-                                                           -1);
+                                                           req.width,
+                                                           req.height);
               GdkRectangle     *padded_layout = g_new (GdkRectangle, 1);
 
               g_hash_table_insert (priv->layout, g_strdup (name), layout);
@@ -1693,12 +1694,10 @@
 
               *padded_layout = *layout;
 
-              padded_layout->width  = req.width;
               if (padded_layout->x + padded_layout->width <
                   area_rectangle->width)
                 padded_layout->width += priv->applet_padding;
 
-              padded_layout->height = req.height;
               if (padded_layout->y + padded_layout->height <
                   area_rectangle->height)
                 padded_layout->height += priv->applet_padding;

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-05-28 15:50:59 UTC (rev 11918)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-05-28 16:37:58 UTC (rev 11919)
@@ -137,6 +137,7 @@
   titlebar->priv->menu_popup_status = FALSE;
 }
 
+#if 0
 static void
 titlebar_menu_detach (GtkWidget *widget,
                       GtkMenu   *menu)
@@ -145,6 +146,7 @@
 
   titlebar->priv->menu = NULL;
 }
+#endif
 
 static void
 titlebar_menu_position_func (GtkMenu  *menu,
@@ -484,9 +486,11 @@
 
   priv->menu = menu;
 
+#if 0
   gtk_menu_attach_to_widget (GTK_MENU (priv->menu),
                              GTK_WIDGET (titlebar),
                              titlebar_menu_detach);
+#endif
   gtk_widget_set_name (menu, HH_TITLEBAR_MENU_WIDGET_NAME);
   g_signal_connect (menu, "deactivate",
                     G_CALLBACK (titlebar_menu_deactivate_cb),

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-28 15:50:59 UTC (rev 11918)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-28 16:37:58 UTC (rev 11919)
@@ -478,7 +478,7 @@
 
   if (priv->layout_mode_sucks)
     {
-      g_signal_connect_swapped (area, "applet-change-end",
+      g_signal_connect_swapped (area, "layout-changed",
                                 G_CALLBACK (hd_home_window_area_changed),
                                 window);
     }
@@ -1358,6 +1358,7 @@
   HDHomeWindowPrivate  *priv;
 
   priv = HD_HOME_WINDOW_GET_PRIVATE (window);
+  g_debug ("layout changed, saving");
   if (!priv->save_area_timeout)
     priv->save_area_timeout = g_timeout_add (SAVE_TIMEOUT,
                                              (GSourceFunc)