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

paned: Generalize code

Browse Source 
No semantic changes, just splitting out a common function and passing a
-1 around.
This commit is contained in:
Benjamin Otte 2011-04-18 01:37:34 +02:00
parent 09cbf24e72
commit a45c599543
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkpaned.c
View File

@ -846,9 +846,29 @@ gtk_paned_finalize (GObject *object)
G_OBJECT_CLASS (gtk_paned_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_paned_parent_class)->finalize (object);
} }
static void
get_preferred_size_for_size (GtkWidget *widget,
GtkOrientation orientation,
gint size,
gint *minimum,
gint *natural)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
if (size < 0)
gtk_widget_get_preferred_width (widget, minimum, natural);
else
gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
else
if (size < 0)
gtk_widget_get_preferred_height (widget, minimum, natural);
else
gtk_widget_get_preferred_height_for_width (widget, size, minimum, natural);
}
static void static void
gtk_paned_get_preferred_size (GtkWidget *widget, gtk_paned_get_preferred_size (GtkWidget *widget,
GtkOrientation orientation, GtkOrientation orientation,
gint size,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
@ -860,21 +880,14 @@ gtk_paned_get_preferred_size (GtkWidget *widget,
if (priv->child1 && gtk_widget_get_visible (priv->child1)) if (priv->child1 && gtk_widget_get_visible (priv->child1))
{ {
if (orientation == GTK_ORIENTATION_HORIZONTAL) get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat);
gtk_widget_get_preferred_width (priv->child1, &child_min, &child_nat);
else
gtk_widget_get_preferred_height (priv->child1, &child_min, &child_nat);
*minimum = child_min; *minimum = child_min;
*natural = child_nat; *natural = child_nat;
} }
if (priv->child2 && gtk_widget_get_visible (priv->child2)) if (priv->child2 && gtk_widget_get_visible (priv->child2))
{ {
if (orientation == GTK_ORIENTATION_HORIZONTAL) get_preferred_size_for_size (priv->child2, orientation, size, &child_min, &child_nat);
gtk_widget_get_preferred_width (priv->child2, &child_min, &child_nat);
else
gtk_widget_get_preferred_height (priv->child2, &child_min, &child_nat);
if (priv->orientation == orientation) if (priv->orientation == orientation)
{ {
@ -908,7 +921,7 @@ gtk_paned_get_preferred_width (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum, natural); gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural);
} }
static void static void
@ -916,7 +929,7 @@ gtk_paned_get_preferred_height (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum, natural); gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural);
} }
static void static void