[gimp/soc-2010-cage] app: make GimpOverlayFrame work as standalone container

[Michael Muré <mmure src gnome org>]

commit 3cc3f63332edbcb3ddaf7eab18d1c4b95104be7f
Author: Michael Natterer <mitch gimp org>
Date:   Sat Jun 12 19:23:22 2010 +0200

    app: make GimpOverlayFrame work as standalone container
    
    Implement size_request() and size_allocate() so it can be used to pack
    an arbitrary widget without the need for being subclassed.

 app/widgets/gimpoverlayframe.c |   69 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpoverlayframe.c b/app/widgets/gimpoverlayframe.c
index f6e61b8..2aa7370 100644
--- a/app/widgets/gimpoverlayframe.c
+++ b/app/widgets/gimpoverlayframe.c
@@ -27,8 +27,12 @@
 #include "gimpoverlayframe.h"
 
 
-static gboolean   gimp_overlay_frame_expose (GtkWidget      *widget,
-                                             GdkEventExpose *eevent);
+static void       gimp_overlay_frame_size_request  (GtkWidget      *widget,
+                                                    GtkRequisition *requisition);
+static void       gimp_overlay_frame_size_allocate (GtkWidget      *widget,
+                                                    GtkAllocation  *allocation);
+static gboolean   gimp_overlay_frame_expose        (GtkWidget      *widget,
+                                                    GdkEventExpose *eevent);
 
 
 G_DEFINE_TYPE (GimpOverlayFrame, gimp_overlay_frame, GTK_TYPE_BIN)
@@ -41,7 +45,9 @@ gimp_overlay_frame_class_init (GimpOverlayFrameClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  widget_class->expose_event = gimp_overlay_frame_expose;
+  widget_class->size_request  = gimp_overlay_frame_size_request;
+  widget_class->size_allocate = gimp_overlay_frame_size_allocate;
+  widget_class->expose_event  = gimp_overlay_frame_expose;
 }
 
 static void
@@ -62,6 +68,58 @@ gimp_overlay_frame_init (GimpOverlayFrame *frame)
   gtk_widget_set_app_paintable (widget, TRUE);
 }
 
+static void
+gimp_overlay_frame_size_request (GtkWidget      *widget,
+                                 GtkRequisition *requisition)
+{
+  GtkContainer   *container = GTK_CONTAINER (widget);
+  GtkWidget      *child     = gtk_bin_get_child (GTK_BIN (widget));
+  GtkRequisition  child_requisition;
+  gint            border_width;
+
+  border_width = gtk_container_get_border_width (container);
+
+  requisition->width  = border_width * 2;
+  requisition->height = border_width * 2;
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      gtk_widget_size_request (child, &child_requisition);
+    }
+  else
+    {
+      child_requisition.width  = 0;
+      child_requisition.height = 0;
+    }
+
+  requisition->width  += child_requisition.width;
+  requisition->height += child_requisition.height;
+}
+
+static void
+gimp_overlay_frame_size_allocate (GtkWidget     *widget,
+                                  GtkAllocation *allocation)
+{
+  GtkContainer  *container = GTK_CONTAINER (widget);
+  GtkWidget     *child     = gtk_bin_get_child (GTK_BIN (widget));
+  GtkAllocation  child_allocation;
+  gint           border_width;
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  border_width = gtk_container_get_border_width (container);
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      child_allocation.x      = allocation->x + border_width;
+      child_allocation.y      = allocation->y + border_width;
+      child_allocation.width  = MAX (allocation->width  - 2 * border_width, 0);
+      child_allocation.height = MAX (allocation->height - 2 * border_width, 0);
+
+      gtk_widget_size_allocate (child, &child_allocation);
+    }
+}
+
 static gboolean
 gimp_overlay_frame_expose (GtkWidget      *widget,
                            GdkEventExpose *eevent)
@@ -70,17 +128,12 @@ gimp_overlay_frame_expose (GtkWidget      *widget,
   GtkStyle      *style;
   GtkAllocation  allocation;
   gint           border_width;
-  gint           inner_width;
-  gint           inner_height;
 
   style = gtk_widget_get_style (widget);
   gtk_widget_get_allocation (widget, &allocation);
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  inner_width  = allocation.width  - border_width / 2;
-  inner_height = allocation.height - border_width / 2;
-
   cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   gdk_cairo_region (cr, eevent->region);
   cairo_clip_preserve (cr);