2006-04-19 Johan Bilien <johan.bilien@nokia.com>

* hildon-widgets/hildon-window.c: Fixed a bug in child size allocation
	  in fullscreen.

diff --git a/ChangeLog b/ChangeLog
index 9951071..ef5208e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Johan Bilien  <johan.bilien@nokia.com>
+
+       * hildon-widgets/hildon-window.c: Fixed a bug in child size allocation
+         in fullscreen.
+
 2006-04-19  Luc Pionchon  <luc.pionchon@nokia.com>
 
        * configure.ac: 0.12.10

diff --git a/Makefile.am b/Makefile.am
index c3dad42..469daec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = hildon-widgets timer ut doc 
+SUBDIRS = hildon-widgets timer doc 
 EXTRA_DIST = \
        debian/changelog \
        debian/control \

diff --git a/configure.ac b/configure.ac
index 56ae284..ffb5cb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,10 @@ AC_PROG_AWK
 AC_PROG_LIBTOOL
 
 AC_HEADER_STDC
-PKG_CHECK_MODULES(OUTO, outo >= 0.1.1)
-AC_SUBST(OUTO_CFLAGS)
+
+
+#PKG_CHECK_MODULES(OUTO, outo >= 0.1.1)
+#AC_SUBST(OUTO_CFLAGS)
 
 CFLAGS="$CFLAGS -std=c99 -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations"
 # -Werror disabled due to the flaw in glib-2.0

diff --git a/hildon-widgets/hildon-window.c b/hildon-widgets/hildon-window.c
index 7c6f91b..90572ff 100644 (file)
--- a/hildon-widgets/hildon-window.c
+++ b/hildon-widgets/hildon-window.c
@@ -665,12 +665,14 @@ hildon_window_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
             alloc.y += b->top;
 
             alloc.height -= b->top;
-            if (box_alloc.height <= 0)
-                alloc.height -= b->bottom;
-            else
-                alloc.height -= (tb->top + tb->bottom);
         }
 
+        if (box_alloc.height <= 0 && 
+                !(HILDON_WINDOW (widget)->priv->fullscreen))
+            alloc.height -= b->bottom;
+        else
+            alloc.height -= (tb->top + tb->bottom);
+
         gtk_widget_size_allocate (bin->child, &alloc);
     }