X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbin.c;h=b64f54156d58a124a8252eaa76807d1ea7f9b675;hb=0ba92bc26d1b716f2f9c0543593f13cd5a92c521;hp=f8c9b7522de39afebd3d5f3773fe07d32aaaae7a;hpb=d2c35ec62a595dc02542edae920b6a63dbb57446;p=~andy%2Fgtk diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index f8c9b7522..b64f54156 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* @@ -24,11 +22,29 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +/** + * SECTION:gtkbin + * @Short_description: A container with just one child + * @Title: GtkBin + * + * The #GtkBin widget is a container with just one child. + * It is not very useful itself, but it is useful for deriving subclasses, + * since it provides common code needed for handling a single child widget. + * + * Many GTK+ widgets are subclasses of #GtkBin, including #GtkWindow, + * #GtkButton, #GtkFrame, #GtkHandleBox or #GtkScrolledWindow. + */ + #include "config.h" #include "gtkbin.h" -#include "gtkextendedlayout.h" +#include "gtksizerequest.h" #include "gtkintl.h" -#include "gtkalias.h" + + +struct _GtkBinPrivate +{ + GtkWidget *child; +}; static void gtk_bin_add (GtkContainer *container, GtkWidget *widget); @@ -40,50 +56,67 @@ static void gtk_bin_forall (GtkContainer *container, gpointer callback_data); static GType gtk_bin_child_type (GtkContainer *container); - -static void gtk_bin_extended_layout_init (GtkExtendedLayoutIface *iface); -static void gtk_bin_get_width_for_height (GtkExtendedLayout *layout, - gint height, - gint *minimum_width, - gint *natural_width); -static void gtk_bin_get_height_for_width (GtkExtendedLayout *layout, - gint width, - gint *minimum_height, - gint *natural_height); - - -static GtkExtendedLayoutIface *parent_extended_layout_iface; - -G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER, - G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT, - gtk_bin_extended_layout_init)) +static void gtk_bin_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width); +static void gtk_bin_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height); +static void gtk_bin_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width); +static void gtk_bin_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height); +static void gtk_bin_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + +G_DEFINE_ABSTRACT_TYPE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER) static void gtk_bin_class_init (GtkBinClass *class) { - GtkContainerClass *container_class; + GtkWidgetClass *widget_class = (GtkWidgetClass*) class; + GtkContainerClass *container_class = (GtkContainerClass*) class; - container_class = (GtkContainerClass*) class; + widget_class->get_preferred_width = gtk_bin_get_preferred_width; + widget_class->get_preferred_height = gtk_bin_get_preferred_height; + widget_class->get_preferred_width_for_height = gtk_bin_get_preferred_width_for_height; + widget_class->get_preferred_height_for_width = gtk_bin_get_preferred_height_for_width; + widget_class->size_allocate = gtk_bin_size_allocate; container_class->add = gtk_bin_add; container_class->remove = gtk_bin_remove; container_class->forall = gtk_bin_forall; container_class->child_type = gtk_bin_child_type; + + g_type_class_add_private (class, sizeof (GtkBinPrivate)); } static void gtk_bin_init (GtkBin *bin) { + GtkBinPrivate *priv; + + bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin, + GTK_TYPE_BIN, + GtkBinPrivate); + priv = bin->priv; + gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE); - bin->child = NULL; + priv->child = NULL; } static GType gtk_bin_child_type (GtkContainer *container) { - if (!GTK_BIN (container)->child) + GtkBinPrivate *priv = GTK_BIN (container)->priv; + + if (!priv->child) return GTK_TYPE_WIDGET; else return G_TYPE_NONE; @@ -94,8 +127,9 @@ gtk_bin_add (GtkContainer *container, GtkWidget *child) { GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; - if (bin->child != NULL) + if (priv->child != NULL) { g_warning ("Attempting to add a widget with type %s to a %s, " "but as a GtkBin subclass a %s can only contain one widget at a time; " @@ -103,12 +137,12 @@ gtk_bin_add (GtkContainer *container, g_type_name (G_OBJECT_TYPE (child)), g_type_name (G_OBJECT_TYPE (bin)), g_type_name (G_OBJECT_TYPE (bin)), - g_type_name (G_OBJECT_TYPE (bin->child))); + g_type_name (G_OBJECT_TYPE (priv->child))); return; } gtk_widget_set_parent (child, GTK_WIDGET (bin)); - bin->child = child; + priv->child = child; } static void @@ -116,14 +150,15 @@ gtk_bin_remove (GtkContainer *container, GtkWidget *child) { GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; gboolean widget_was_visible; - g_return_if_fail (bin->child == child); + g_return_if_fail (priv->child == child); widget_was_visible = gtk_widget_get_visible (child); gtk_widget_unparent (child); - bin->child = NULL; + priv->child = NULL; /* queue resize regardless of gtk_widget_get_visible (container), * since that's what is needed by toplevels, which derive from GtkBin. @@ -139,103 +174,153 @@ gtk_bin_forall (GtkContainer *container, gpointer callback_data) { GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; - if (bin->child) - (* callback) (bin->child, callback_data); + if (priv->child) + (* callback) (priv->child, callback_data); } +static int +gtk_bin_get_effective_border_width (GtkBin *bin) +{ + if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width) + return 0; -/* GtkBin widgets define the padding and borders independantly so - * we cannot provide a generic get_desired_size() for the same reason - * we never implemented size_request() here. - * - * But for cases where the GtkBin class's padding is constant and - * does not vary based on allocation (most cases), we can at least - * deduce a common code path for the get_width_for_height()/get_height_for_width() - * cases by using the delta of the base size requsts. - */ -static void -gtk_bin_extended_layout_init (GtkExtendedLayoutIface *iface) + return gtk_container_get_border_width (GTK_CONTAINER (bin)); +} + +static void +gtk_bin_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { - parent_extended_layout_iface = g_type_interface_peek_parent (iface); + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; + + *minimum_width = 0; + *natural_width = 0; + + if (priv->child && gtk_widget_get_visible (priv->child)) + { + gint child_min, child_nat; + gtk_widget_get_preferred_width (priv->child, + &child_min, &child_nat); + *minimum_width = child_min; + *natural_width = child_nat; + } - iface->get_width_for_height = gtk_bin_get_width_for_height; - iface->get_height_for_width = gtk_bin_get_height_for_width; + border_width = gtk_bin_get_effective_border_width (bin); + *minimum_width += 2 * border_width; + *natural_width += 2 * border_width; } static void -get_child_padding_delta (GtkBin *bin, - gint *delta_h, - gint *delta_v) +gtk_bin_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height) { - gint hmin, vmin, child_hmin, child_vmin; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; - gtk_extended_layout_get_desired_width (GTK_EXTENDED_LAYOUT (bin), &hmin, NULL); - gtk_extended_layout_get_desired_height (GTK_EXTENDED_LAYOUT (bin), &vmin, NULL); + *minimum_height = 0; + *natural_height = 0; - gtk_extended_layout_get_desired_width (GTK_EXTENDED_LAYOUT (bin->child), &child_hmin, NULL); - gtk_extended_layout_get_desired_height (GTK_EXTENDED_LAYOUT (bin->child), &child_vmin, NULL); + if (priv->child && gtk_widget_get_visible (priv->child)) + { + gint child_min, child_nat; + gtk_widget_get_preferred_height (priv->child, + &child_min, &child_nat); + *minimum_height = child_min; + *natural_height = child_nat; + } - *delta_h = hmin - child_hmin; - *delta_v = vmin - child_vmin; + border_width = gtk_bin_get_effective_border_width (bin); + *minimum_height += 2 * border_width; + *natural_height += 2 * border_width; } static void -gtk_bin_get_width_for_height (GtkExtendedLayout *layout, - gint height, - gint *minimum_width, - gint *natural_width) +gtk_bin_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width) { - GtkBin *bin = GTK_BIN (layout); - gint hdelta, vdelta, child_min, child_nat; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; - if (bin->child) + *minimum_width = 0; + *natural_width = 0; + + border_width = gtk_bin_get_effective_border_width (bin); + + if (priv->child && gtk_widget_get_visible (priv->child)) { - get_child_padding_delta (bin, &hdelta, &vdelta); - - gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (bin->child), - height - vdelta, - &child_min, &child_nat); - - if (minimum_width) - *minimum_width = child_min + hdelta; - - if (natural_width) - *natural_width = child_nat + hdelta; + gint child_min, child_nat; + gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width, + &child_min, &child_nat); + + *minimum_width = child_min; + *natural_width = child_nat; } - else - GTK_EXTENDED_LAYOUT_GET_IFACE (layout)->get_desired_width (layout, minimum_width, natural_width); -/* parent_extended_layout_iface->get_height_for_width (layout, height, minimum_width, natural_width); */ + + *minimum_width += 2 * border_width; + *natural_width += 2 * border_width; } static void -gtk_bin_get_height_for_width (GtkExtendedLayout *layout, - gint width, - gint *minimum_height, - gint *natural_height) +gtk_bin_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height) { - GtkBin *bin = GTK_BIN (layout); - gint hdelta, vdelta, child_min, child_nat; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; + + *minimum_height = 0; + *natural_height = 0; - if (bin->child) + border_width = gtk_bin_get_effective_border_width (bin); + + if (priv->child && gtk_widget_get_visible (priv->child)) { - get_child_padding_delta (bin, &hdelta, &vdelta); - - gtk_extended_layout_get_height_for_width (GTK_EXTENDED_LAYOUT (bin->child), - width - hdelta, - &child_min, &child_nat); - - if (minimum_height) - *minimum_height = child_min + vdelta; - - if (natural_height) - *natural_height = child_nat + vdelta; + gint child_min, child_nat; + gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width, + &child_min, &child_nat); + + *minimum_height = child_min; + *natural_height = child_nat; } - else - GTK_EXTENDED_LAYOUT_GET_IFACE (layout)->get_desired_height (layout, minimum_height, natural_height); -/* parent_extended_layout_iface->get_height_for_width (layout, width, minimum_height, natural_height); */ + + *minimum_height += 2 * border_width; + *natural_height += 2 * border_width; } +static void +gtk_bin_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + + gtk_widget_set_allocation (widget, allocation); + + if (priv->child && gtk_widget_get_visible (priv->child)) + { + GtkAllocation child_allocation; + gint border_width = gtk_bin_get_effective_border_width (bin); + + child_allocation.x = allocation->x + border_width; + child_allocation.y = allocation->y + border_width; + child_allocation.width = allocation->width - 2 * border_width; + child_allocation.height = allocation->height - 2 * border_width; + + gtk_widget_size_allocate (priv->child, &child_allocation); + } +} /** * gtk_bin_get_child: @@ -252,8 +337,12 @@ gtk_bin_get_child (GtkBin *bin) { g_return_val_if_fail (GTK_IS_BIN (bin), NULL); - return bin->child; + return bin->priv->child; } -#define __GTK_BIN_C__ -#include "gtkaliasdef.c" +void +_gtk_bin_set_child (GtkBin *bin, + GtkWidget *widget) +{ + bin->priv->child = widget; +}