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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-04-12 17:38:56 +0300 (Thu, 12 Apr 2007)
New Revision: 11008

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/desktop.conf.in
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c
Log:

	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
        - Code cleanup
        * libhildondesktop/hildon-desktop-panel-window.c:
        - If the window is not to be moved, it uses parent implementations for
        check_resize, size_request and size_allocation.
        * data/desktop.conf.in:
        - Changed size of statusbar panel.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-12 13:51:04 UTC (rev 11007)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-12 14:38:56 UTC (rev 11008)
@@ -1,5 +1,15 @@
 2007-04-12  Moises Martinez  <moises.martinez at nokia.com>
 
+	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
+	- Code cleanup 
+	* libhildondesktop/hildon-desktop-panel-window.c:
+	- If the window is not to be moved, it uses parent implementations for
+	check_resize, size_request and size_allocation.
+	* data/desktop.conf.in:
+	- Changed size of statusbar panel.
+
+2007-04-12  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hd-desktop.c:
 	- Implemented banner when launching applications. Fixes: NB#53974
 	* libhildonwm/hd-wm.c:

Modified: projects/haf/trunk/hildon-desktop/data/desktop.conf.in
===================================================================
--- projects/haf/trunk/hildon-desktop/data/desktop.conf.in	2007-04-12 13:51:04 UTC (rev 11007)
+++ projects/haf/trunk/hildon-desktop/data/desktop.conf.in	2007-04-12 14:38:56 UTC (rev 11008)
@@ -21,7 +21,7 @@
 X-Type=panel_expandable
 X-Position-X=423
 X-Position-Y=0
-X-Size-Width=270
+X-Size-Width=282
 X-Size-Height=50
 X-Orientation=top
 X-Config-File=statusbar.conf

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-04-12 13:51:04 UTC (rev 11007)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-04-12 14:38:56 UTC (rev 11008)
@@ -197,6 +197,8 @@
   if (parent != NULL)
     gtk_container_add (parent,
   		       GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container));
+  
+  gtk_widget_pop_composite_child ();
 
   g_object_get (object,"orientation", &orientation, NULL);
 
@@ -228,7 +230,7 @@
 
        gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
        gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
+       
        gtk_window_set_type_hint( GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK);
 
        gtk_widget_realize (GTK_WIDGET (window));
@@ -282,8 +284,6 @@
 
   g_free (wm_name);
  
-  gtk_widget_pop_composite_child ();
-
   g_signal_connect (window->priv->hdwm,
 		    "fullscreen",
 		    G_CALLBACK (hildon_desktop_window_dialog_fullscreen_cb),

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c	2007-04-12 13:51:04 UTC (rev 11007)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c	2007-04-12 14:38:56 UTC (rev 11008)
@@ -929,6 +929,12 @@
   GtkRequisition  requisition;
   GtkWidget      *widget;
 
+  if (!HILDON_DESKTOP_PANEL_WINDOW (container)->priv->move)
+  {
+    GTK_CONTAINER_CLASS (hildon_desktop_panel_window_parent_class)->check_resize (container);
+    return;
+  }
+
   widget = GTK_WIDGET (container);
 
   if (!GTK_WIDGET_VISIBLE (widget))
@@ -958,6 +964,12 @@
   gboolean position_changed = FALSE;
   gboolean size_changed     = FALSE;
 
+  if (!HILDON_DESKTOP_PANEL_WINDOW (widget)->priv->move)
+  {
+    GTK_WIDGET_CLASS (hildon_desktop_panel_window_parent_class)->size_request (widget,requisition);
+    return;
+  }
+
   window = HILDON_DESKTOP_PANEL_WINDOW (widget);
   bin	 = GTK_BIN (widget);
 
@@ -983,8 +995,7 @@
     position_changed = TRUE;	
   }
 
-  if (window->priv->move)
-    hildon_desktop_panel_win_move_resize (window,position_changed,size_changed);
+  hildon_desktop_panel_win_move_resize (window,position_changed,size_changed);
 }
 
 static void 
@@ -995,6 +1006,12 @@
   GtkBin *bin = GTK_BIN (widget);
   GtkAllocation challoc;
 
+  if (!window->priv->move)
+  {
+    GTK_WIDGET_CLASS (hildon_desktop_panel_window_parent_class)->size_allocate (widget,allocation);
+    return;
+  }
+
   widget->allocation = *allocation;
 
   if (window->priv->orientation & HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_HORIZONTAL)