[maemo-commits] [maemo-commits] r15396 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-04-15 14:24:10 +0300 (Tue, 15 Apr 2008)
New Revision: 15396

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-banner.c
Log:
2008-04-15 13:21:13    <timj at imendio.com>

        * src/hildon-banner.c: refetch layout pointer after GtkLabel possibly
        recreated its layout, spotted by Kris. this fixes all remaining
        artefacts and stability issues with the banner code. in particular:
        Bug 83953 - Lock dialog is not visible when device is locked for the first time after flash




Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-04-15 11:05:47 UTC (rev 15395)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-04-15 11:24:10 UTC (rev 15396)
@@ -1,3 +1,10 @@
+2008-04-15 13:21:13    <timj at imendio.com>
+
+	* src/hildon-banner.c: refetch layout pointer after GtkLabel possibly
+	recreated its layout, spotted by Kris. this fixes all remaining
+	artefacts and stability issues with the banner code. in particular:
+	Bug 83953 - Lock dialog is not visible when device is locked for the first time after flash
+
 2008-04-14 16:52:59    <timj at imendio.com>
 
 	* src/hildon-banner.c: guard force_to_wrap_truncated() against

Modified: projects/haf/trunk/hildon-1/src/hildon-banner.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-banner.c	2008-04-15 11:05:47 UTC (rev 15395)
+++ projects/haf/trunk/hildon-1/src/hildon-banner.c	2008-04-15 11:24:10 UTC (rev 15396)
@@ -645,9 +645,6 @@
 
     label = GTK_LABEL (priv->label);
 
-    if (!GTK_WIDGET_REALIZED (banner) || !GTK_WIDGET_REALIZED (label))
-      return;
-
     layout = gtk_label_get_layout (label);
 
     pango_layout_get_extents (layout, NULL, &logical);
@@ -667,10 +664,14 @@
         priv->has_been_wrapped = TRUE;
     }
 
-    /* Make the label update its layout */
+    /* Make the label update its layout; and update our layout pointer
+     * because the layout will be cleared and refreshed.
+     */
     gtk_widget_set_size_request (GTK_WIDGET (label), width, height);
     gtk_widget_size_request (GTK_WIDGET (label), &requisition);
 
+    layout = gtk_label_get_layout (label);
+
     /* If the layout has now been wrapped and exceeds 3 lines, we truncate
      * the rest of the label according to spec.
      */