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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-28 18:20:11 +0300 (Mon, 28 May 2007)
New Revision: 11915

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

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

	* libhildondesktop/hildon-home-titlebar.c:
	- attach the menu to the titlebar



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 15:19:14 UTC (rev 11914)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 15:20:11 UTC (rev 11915)
@@ -1,3 +1,8 @@
+2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-titlebar.c:
+	- attach the menu to the titlebar
+
 2007-05-28  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hn-others-button.c:
@@ -3,5 +8,5 @@
 	* src/hd-applications-menu.c:
 	- Attached to proper widgets.
-	
+
 2007-05-28  Lucas Rocha  <lucas.rocha at nokia.com>
 

Modified: projects/haf/trunk/hildon-desktop/data/home-layout.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/home-layout.conf	2007-05-28 15:19:14 UTC (rev 11914)
+++ projects/haf/trunk/hildon-desktop/data/home-layout.conf	2007-05-28 15:20:11 UTC (rev 11915)
@@ -1,11 +1,11 @@
 [/usr/share/applications/hildon-home/isearch-applet.desktop]
-X=20
-Y=7
+X=10
+Y=10
 X-home-applet-width=390
 X-home-applet-height=50
 
 [/usr/share/applications/hildon-home/hildon-home-webshortcut.desktop]
-X=420
-Y=276
-X-home-applet-width=290
-X-home-applet-height=134
+X=400
+Y=300
+X-home-applet-width=300
+X-home-applet-height=100

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:19:14 UTC (rev 11914)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-05-28 15:20:11 UTC (rev 11915)
@@ -138,6 +138,15 @@
 }
 
 static void
+titlebar_menu_detach (GtkWidget *widget,
+                      GtkMenu   *menu)
+{
+  HildonHomeTitlebar *titlebar = HILDON_HOME_TITLEBAR (widget);
+
+  titlebar->priv->menu = NULL;
+}
+
+static void
 titlebar_menu_position_func (GtkMenu  *menu,
                              gint     *x,
                              gint     *y,
@@ -475,6 +484,9 @@
 
   priv->menu = menu;
 
+  gtk_menu_attach_to_widget (GTK_MENU (priv->menu),
+                             GTK_WIDGET (titlebar),
+                             titlebar_menu_detach);
   gtk_widget_set_name (menu, HH_TITLEBAR_MENU_WIDGET_NAME);
   g_signal_connect (menu, "deactivate",
                     G_CALLBACK (titlebar_menu_deactivate_cb),