AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

bin: Handle border width if we have to

Browse Source 
Some bin subclasses call gtk_container_handle_border_width(), some
don't. So work with both cases.
This commit is contained in:
Benjamin Otte 2012-11-11 20:24:58 +01:00
parent a08eb4d58a
commit 5e01a05b30
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gtk/gtkbin.c
View File

@ -180,6 +180,14 @@ gtk_bin_forall (GtkContainer *container,
(* callback) (priv->child, callback_data); (* 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;
return gtk_container_get_border_width (GTK_CONTAINER (bin));
}
static void static void
gtk_bin_get_preferred_width (GtkWidget *widget, gtk_bin_get_preferred_width (GtkWidget *widget,
@ -188,6 +196,7 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
{ {
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv; GtkBinPrivate *priv = bin->priv;
gint border_width;
if (priv->child && gtk_widget_get_visible (priv->child)) if (priv->child && gtk_widget_get_visible (priv->child))
{ {
@ -197,6 +206,10 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
*minimum_width = child_min; *minimum_width = child_min;
*natural_width = child_nat; *natural_width = child_nat;
} }
border_width = gtk_bin_get_effective_border_width (bin);
*minimum_width += 2 * border_width;
*natural_width += 2 * border_width;
} }
static void static void
@ -206,6 +219,7 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
{ {
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv; GtkBinPrivate *priv = bin->priv;
gint border_width;
if (priv->child && gtk_widget_get_visible (priv->child)) if (priv->child && gtk_widget_get_visible (priv->child))
{ {
@ -215,6 +229,10 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
*minimum_height = child_min; *minimum_height = child_min;
*natural_height = child_nat; *natural_height = child_nat;
} }
border_width = gtk_bin_get_effective_border_width (bin);
*minimum_height += 2 * border_width;
*natural_height += 2 * border_width;
} }
static void static void
@ -225,18 +243,22 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
{ {
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv; GtkBinPrivate *priv = bin->priv;
gint border_width;
border_width = gtk_bin_get_effective_border_width (bin);
if (priv->child && gtk_widget_get_visible (priv->child)) if (priv->child && gtk_widget_get_visible (priv->child))
{ {
gint child_min, child_nat; gint child_min, child_nat;
gtk_widget_get_preferred_width_for_height (priv->child, height, gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
&child_min, &child_nat); &child_min, &child_nat);
*minimum_width = child_min; *minimum_width = child_min;
*natural_width = child_nat; *natural_width = child_nat;
} }
else
GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, minimum_width, natural_width); *minimum_width += 2 * border_width;
*natural_width += 2 * border_width;
} }
static void static void
@ -247,18 +269,22 @@ gtk_bin_get_preferred_height_for_width (GtkWidget *widget,
{ {
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv; GtkBinPrivate *priv = bin->priv;
gint border_width;
border_width = gtk_bin_get_effective_border_width (bin);
if (priv->child && gtk_widget_get_visible (priv->child)) if (priv->child && gtk_widget_get_visible (priv->child))
{ {
gint child_min, child_nat; gint child_min, child_nat;
gtk_widget_get_preferred_height_for_width (priv->child, width, gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width,
&child_min, &child_nat); &child_min, &child_nat);
*minimum_height = child_min; *minimum_height = child_min;
*natural_height = child_nat; *natural_height = child_nat;
} }
else
GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, minimum_height, natural_height); *minimum_height += 2 * border_width;
*natural_height += 2 * border_width;
} }
static void static void
@ -271,7 +297,17 @@ gtk_bin_size_allocate (GtkWidget *widget,
gtk_widget_set_allocation (widget, allocation); gtk_widget_set_allocation (widget, allocation);
if (priv->child && gtk_widget_get_visible (priv->child)) if (priv->child && gtk_widget_get_visible (priv->child))
gtk_widget_size_allocate (priv->child, allocation); {
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);
}
} }
/** /**