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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-19 16:52:55 +0300 (Tue, 19 Jun 2007)
New Revision: 12387

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-window.c
Log:

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

	* libhildondesktop/hildon-home-window.c:
	- do not propagate expose events to the child, as this
	is already done by the parent class
	* libhildondesktop/hildon-home-area.c:
	- replaced a gtk_fixed_move with hildon_home_area_move
	- fixed the window to update after a move



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-19 13:20:11 UTC (rev 12386)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-19 13:52:55 UTC (rev 12387)
@@ -1,3 +1,12 @@
+2007-06-19  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-window.c:
+	- do not propagate expose events to the child, as this
+	is already done by the parent class
+	* libhildondesktop/hildon-home-area.c:
+	- replaced a gtk_fixed_move with hildon_home_area_move
+	- fixed the window to update after a move
+
 2007-06-19  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu-item.c: Fixed ellipsizing of labels.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-19 13:20:11 UTC (rev 12386)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-19 13:52:55 UTC (rev 12387)
@@ -1319,6 +1319,14 @@
 
   priv = HILDON_HOME_AREA_GET_PRIVATE (widget);
 
+#if 0
+  g_debug ("Got expose event on %i,%i %ix%i",
+           event->area.x,
+           event->area.y,
+           event->area.width,
+           event->area.height);
+#endif
+
   if (GTK_WIDGET_DRAWABLE (widget))
     {
       XRectangle                rectangle;
@@ -2042,10 +2050,10 @@
       if (list_element)
         {
           applet = GTK_WIDGET (list_element->data);
-          gtk_fixed_move (GTK_FIXED (area),
-                          applet,
-                          x,
-                          y);
+          hildon_home_area_move (area,
+                                 applet,
+                                 x,
+                                 y);
 
           applets = g_list_remove (applets, applet);
         }
@@ -2214,12 +2222,10 @@
                               widget->allocation.width,
                               widget->allocation.height};
 
-      gdk_window_invalidate_rect (widget->window, &invalid, TRUE);
-
-      invalid.x = x + GTK_WIDGET (area)->allocation.x;
-      invalid.y = y + GTK_WIDGET (area)->allocation.y;
-
-      gdk_window_invalidate_rect (widget->window, &invalid, TRUE);
+      gdk_window_invalidate_rect (GTK_WIDGET (area)->window, &invalid, TRUE);
+      invalid.x = x;
+      invalid.y = y;
+      gdk_window_invalidate_rect (GTK_WIDGET (area)->window, &invalid, TRUE);
     }
 
   data->x = x;

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-06-19 13:20:11 UTC (rev 12386)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-06-19 13:52:55 UTC (rev 12387)
@@ -256,11 +256,6 @@
   priv = window->priv;
   child = GTK_BIN (widget)->child;
 
-  if (GTK_IS_WIDGET (child))
-    gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                    child,
-                                    event);
-
   if (GTK_IS_WIDGET (priv->titlebar))
     gtk_container_propagate_expose (GTK_CONTAINER (widget),
                                     priv->titlebar,