Fix a refcounting issues in GtkPlug

[~andy/gtk] / gtk / gtkframe.c

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index febefaf4a6ff7b1ce177d7adf958a0f7e1cc7595..eba0fd9c4d8e4008c6ccf6d465a5bd52646d9cde 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -24,12 +24,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+#include "gtkbuildable.h"
 #include "gtkalias.h"
 
 #define LABEL_PAD 1
@@ -73,7 +74,16 @@ static void gtk_frame_compute_child_allocation      (GtkFrame      *frame,
 static void gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
                                                     GtkAllocation *child_allocation);
 
-G_DEFINE_TYPE (GtkFrame, gtk_frame, GTK_TYPE_BIN);
+/* GtkBuildable */
+static void gtk_frame_buildable_init                (GtkBuildableIface *iface);
+static void gtk_frame_buildable_add_child           (GtkBuildable *buildable,
+                                                    GtkBuilder   *builder,
+                                                    GObject      *child,
+                                                    const gchar  *type);
+
+G_DEFINE_TYPE_WITH_CODE (GtkFrame, gtk_frame, GTK_TYPE_BIN,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                               gtk_frame_buildable_init))
 
 static void
 gtk_frame_class_init (GtkFrameClass *class)
@@ -104,7 +114,7 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                       P_("The horizontal alignment of the label"),
                                                       0.0,
                                                       1.0,
-                                                      0.5,
+                                                      0.0,
                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_YALIGN,
@@ -149,6 +159,26 @@ gtk_frame_class_init (GtkFrameClass *class)
   class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
 }
 
+static void
+gtk_frame_buildable_init (GtkBuildableIface *iface)
+{
+  iface->add_child = gtk_frame_buildable_add_child;
+}
+
+static void
+gtk_frame_buildable_add_child (GtkBuildable *buildable,
+                              GtkBuilder   *builder,
+                              GObject      *child,
+                              const gchar  *type)
+{
+  if (type && strcmp (type, "label") == 0)
+    gtk_frame_set_label_widget (GTK_FRAME (buildable), GTK_WIDGET (child));
+  else if (!type)
+    gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
+  else
+    GTK_BUILDER_WARN_INVALID_CHILD_TYPE (GTK_FRAME (buildable), type);
+}
+
 static void
 gtk_frame_init (GtkFrame *frame)
 {
@@ -276,8 +306,8 @@ gtk_frame_forall (GtkContainer *container,
 /**
  * gtk_frame_set_label:
  * @frame: a #GtkFrame
- * @label: the text to use as the label of the frame
- * 
+ * @label: (allow-none): the text to use as the label of the frame
+ *
  * Sets the text of the label. If @label is %NULL,
  * the current label is removed.
  **/
@@ -319,7 +349,7 @@ gtk_frame_get_label (GtkFrame *frame)
 {
   g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
 
-  if (frame->label_widget && GTK_IS_LABEL (frame->label_widget))
+  if (GTK_IS_LABEL (frame->label_widget))
     return gtk_label_get_text (GTK_LABEL (frame->label_widget));
   else
     return NULL;
@@ -395,7 +425,9 @@ gtk_frame_get_label_widget (GtkFrame *frame)
  *   of the widget. A value of 0.0 represents left alignment;
  *   1.0 represents right alignment.
  * @yalign: The y alignment of the label. A value of 0.0 aligns under 
- *   the frame; 1.0 aligns above the frame.
+ *   the frame; 1.0 aligns above the frame. If the values are exactly
+ *   0.0 or 1.0 the gap in the frame won't be painted because the label
+ *   will be completely above or below the frame.
  * 
  * Sets the alignment of the frame widget's label. The
  * default values for a newly created frame are 0.0 and 0.5.
@@ -523,20 +555,26 @@ gtk_frame_paint (GtkWidget    *widget,
          else
            xalign = 1 - frame->label_xalign;
 
-         height_extra = MAX (0, child_requisition.height - widget->style->ythickness);
-         height_extra *= (1 - frame->label_yalign);
+         height_extra = MAX (0, child_requisition.height - widget->style->ythickness)
+           - frame->label_yalign * child_requisition.height;
          y -= height_extra;
          height += height_extra;
          
          x2 = widget->style->xthickness + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD;
-
          
-         gtk_paint_shadow_gap (widget->style, widget->window,
-                               widget->state, frame->shadow_type,
-                               area, widget, "frame",
-                               x, y, width, height,
-                               GTK_POS_TOP, 
-                               x2, child_requisition.width + 2 * LABEL_PAD);
+         /* If the label is completely over or under the frame we can omit the gap */
+         if (frame->label_yalign == 0.0 || frame->label_yalign == 1.0)
+           gtk_paint_shadow (widget->style, widget->window,
+                             widget->state, frame->shadow_type,
+                             area, widget, "frame",
+                             x, y, width, height);
+         else
+           gtk_paint_shadow_gap (widget->style, widget->window,
+                                 widget->state, frame->shadow_type,
+                                 area, widget, "frame",
+                                 x, y, width, height,
+                                 GTK_POS_TOP,
+                                 x2, child_requisition.width + 2 * LABEL_PAD);
        }
        else
         gtk_paint_shadow (widget->style, widget->window,
@@ -554,7 +592,7 @@ gtk_frame_expose (GtkWidget      *widget,
     {
       gtk_frame_paint (widget, &event->area);
 
-      (* GTK_WIDGET_CLASS (gtk_frame_parent_class)->expose_event) (widget, event);
+      GTK_WIDGET_CLASS (gtk_frame_parent_class)->expose_event (widget, event);
     }
 
   return FALSE;
@@ -574,7 +612,7 @@ gtk_frame_size_request (GtkWidget      *widget,
 
       requisition->width = child_requisition.width + 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
       requisition->height =
-       MAX (0, child_requisition.height - GTK_WIDGET (widget)->style->ythickness);
+       MAX (0, child_requisition.height - widget->style->ythickness);
     }
   else
     {
@@ -638,9 +676,9 @@ gtk_frame_size_allocate (GtkWidget     *widget,
       
       child_allocation.x = frame->child_allocation.x + LABEL_SIDE_PAD +
        (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD;
-      child_allocation.width = child_requisition.width;
+      child_allocation.width = MIN (child_requisition.width, new_allocation.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD);
 
-      child_allocation.y = frame->child_allocation.y - child_requisition.height;
+      child_allocation.y = frame->child_allocation.y - MAX (child_requisition.height, widget->style->ythickness);
       child_allocation.height = child_requisition.height;
 
       gtk_widget_size_allocate (frame->label_widget, &child_allocation);