forked from AuroraMiddleware/gtk
d1bda8d562
Sun Feb 7 19:49:21 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkwindow.c (gtk_window_move_resize): Fixed some bugs with set_default_size. Sat Feb 6 13:23:51 1999 Owen Taylor <otaylor@redhat.com> * docs/Changes-1.2.txt: Added information about the change to gtk_widget_size_request(). * gtk/gtkentry.c: Call gtk_widget_get_child_requisition explicitely since we differentiate between the usize set by the user and what we got. (Ugh) * gtk/gtkwidget.[ch] (gtk_widget_get_child_requisition): New function to return the effective size of a widget as it looks to its parent. * gtk/gtkwidget.c (gtk_widget_size_request): Leave widget->requisition set to exactly what the widget asked for, and then make a copy of that into the requisition argument. Allow a NULL requisition argument, and, if G_ENABLE_DEBUG, warn if requisition == &widget->requisition. * gtkalignment.c gtkaspectframe.c gtkbutton.c gtkclist.c gtkcontainer.c gtkentry.c gtkeventbox.c gtkfixed.c gtkframe.c gtkhandlebox.c gtkhbox.c gtkhpaned.c gtklayout.c gtklist.c gtklistitem.c gtkmenu.c gtkmenubar.c gtkmenuitem.c gtknotebook.c gtkoptionmenu.c gtkpacker.c gtkscrolledwindow.c gtktable.c gtktoolbar.c gtktree.c gtktreeitem.c gtkvbox.c gtkviewport.c gtkvpaned.c gtkwindow.c Avoid calling gtk_widget_size_request with requisition == widget->requisition; use gtk_widget_get_child_requisition to get the size of children.
322 lines
7.9 KiB
C
322 lines
7.9 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library 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.
|
|
*/
|
|
#include "gtkhbox.h"
|
|
|
|
|
|
static void gtk_hbox_class_init (GtkHBoxClass *klass);
|
|
static void gtk_hbox_init (GtkHBox *box);
|
|
static void gtk_hbox_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition);
|
|
static void gtk_hbox_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation);
|
|
|
|
|
|
GtkType
|
|
gtk_hbox_get_type (void)
|
|
{
|
|
static GtkType hbox_type = 0;
|
|
|
|
if (!hbox_type)
|
|
{
|
|
static const GtkTypeInfo hbox_info =
|
|
{
|
|
"GtkHBox",
|
|
sizeof (GtkHBox),
|
|
sizeof (GtkHBoxClass),
|
|
(GtkClassInitFunc) gtk_hbox_class_init,
|
|
(GtkObjectInitFunc) gtk_hbox_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
hbox_type = gtk_type_unique (GTK_TYPE_BOX, &hbox_info);
|
|
}
|
|
|
|
return hbox_type;
|
|
}
|
|
|
|
static void
|
|
gtk_hbox_class_init (GtkHBoxClass *class)
|
|
{
|
|
GtkWidgetClass *widget_class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
widget_class->size_request = gtk_hbox_size_request;
|
|
widget_class->size_allocate = gtk_hbox_size_allocate;
|
|
}
|
|
|
|
static void
|
|
gtk_hbox_init (GtkHBox *hbox)
|
|
{
|
|
}
|
|
|
|
GtkWidget*
|
|
gtk_hbox_new (gboolean homogeneous,
|
|
gint spacing)
|
|
{
|
|
GtkHBox *hbox;
|
|
|
|
hbox = gtk_type_new (gtk_hbox_get_type ());
|
|
|
|
GTK_BOX (hbox)->spacing = spacing;
|
|
GTK_BOX (hbox)->homogeneous = homogeneous ? TRUE : FALSE;
|
|
|
|
return GTK_WIDGET (hbox);
|
|
}
|
|
|
|
|
|
static void
|
|
gtk_hbox_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition)
|
|
{
|
|
GtkBox *box;
|
|
GtkBoxChild *child;
|
|
GList *children;
|
|
gint nvis_children;
|
|
gint width;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_HBOX (widget));
|
|
g_return_if_fail (requisition != NULL);
|
|
|
|
box = GTK_BOX (widget);
|
|
requisition->width = 0;
|
|
requisition->height = 0;
|
|
nvis_children = 0;
|
|
|
|
children = box->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget))
|
|
{
|
|
GtkRequisition child_requisition;
|
|
|
|
gtk_widget_size_request (child->widget, &child_requisition);
|
|
|
|
if (box->homogeneous)
|
|
{
|
|
width = child_requisition.width + child->padding * 2;
|
|
requisition->width = MAX (requisition->width, width);
|
|
}
|
|
else
|
|
{
|
|
requisition->width += child_requisition.width + child->padding * 2;
|
|
}
|
|
|
|
requisition->height = MAX (requisition->height, child_requisition.height);
|
|
|
|
nvis_children += 1;
|
|
}
|
|
}
|
|
|
|
if (nvis_children > 0)
|
|
{
|
|
if (box->homogeneous)
|
|
requisition->width *= nvis_children;
|
|
requisition->width += (nvis_children - 1) * box->spacing;
|
|
}
|
|
|
|
requisition->width += GTK_CONTAINER (box)->border_width * 2;
|
|
requisition->height += GTK_CONTAINER (box)->border_width * 2;
|
|
}
|
|
|
|
static void
|
|
gtk_hbox_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation)
|
|
{
|
|
GtkBox *box;
|
|
GtkBoxChild *child;
|
|
GList *children;
|
|
GtkAllocation child_allocation;
|
|
gint nvis_children;
|
|
gint nexpand_children;
|
|
gint child_width;
|
|
gint width;
|
|
gint extra;
|
|
gint x;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_HBOX (widget));
|
|
g_return_if_fail (allocation != NULL);
|
|
|
|
box = GTK_BOX (widget);
|
|
widget->allocation = *allocation;
|
|
|
|
nvis_children = 0;
|
|
nexpand_children = 0;
|
|
children = box->children;
|
|
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget))
|
|
{
|
|
nvis_children += 1;
|
|
if (child->expand)
|
|
nexpand_children += 1;
|
|
}
|
|
}
|
|
|
|
if (nvis_children > 0)
|
|
{
|
|
if (box->homogeneous)
|
|
{
|
|
width = (allocation->width -
|
|
GTK_CONTAINER (box)->border_width * 2 -
|
|
(nvis_children - 1) * box->spacing);
|
|
extra = width / nvis_children;
|
|
}
|
|
else if (nexpand_children > 0)
|
|
{
|
|
width = (gint) allocation->width - (gint) widget->requisition.width;
|
|
extra = width / nexpand_children;
|
|
}
|
|
else
|
|
{
|
|
width = 0;
|
|
extra = 0;
|
|
}
|
|
|
|
x = allocation->x + GTK_CONTAINER (box)->border_width;
|
|
child_allocation.y = allocation->y + GTK_CONTAINER (box)->border_width;
|
|
child_allocation.height = MAX (1, (gint) allocation->height - (gint) GTK_CONTAINER (box)->border_width * 2);
|
|
|
|
children = box->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if ((child->pack == GTK_PACK_START) && GTK_WIDGET_VISIBLE (child->widget))
|
|
{
|
|
if (box->homogeneous)
|
|
{
|
|
if (nvis_children == 1)
|
|
child_width = width;
|
|
else
|
|
child_width = extra;
|
|
|
|
nvis_children -= 1;
|
|
width -= extra;
|
|
}
|
|
else
|
|
{
|
|
GtkRequisition child_requisition;
|
|
|
|
gtk_widget_get_child_requisition (child->widget, &child_requisition);
|
|
|
|
child_width = child_requisition.width + child->padding * 2;
|
|
|
|
if (child->expand)
|
|
{
|
|
if (nexpand_children == 1)
|
|
child_width += width;
|
|
else
|
|
child_width += extra;
|
|
|
|
nexpand_children -= 1;
|
|
width -= extra;
|
|
}
|
|
}
|
|
|
|
if (child->fill)
|
|
{
|
|
child_allocation.width = MAX (1, (gint) child_width - (gint) child->padding * 2);
|
|
child_allocation.x = x + child->padding;
|
|
}
|
|
else
|
|
{
|
|
GtkRequisition child_requisition;
|
|
|
|
gtk_widget_get_child_requisition (child->widget, &child_requisition);
|
|
child_allocation.width = child_requisition.width;
|
|
child_allocation.x = x + (child_width - child_allocation.width) / 2;
|
|
}
|
|
|
|
gtk_widget_size_allocate (child->widget, &child_allocation);
|
|
|
|
x += child_width + box->spacing;
|
|
}
|
|
}
|
|
|
|
x = allocation->x + allocation->width - GTK_CONTAINER (box)->border_width;
|
|
|
|
children = box->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if ((child->pack == GTK_PACK_END) && GTK_WIDGET_VISIBLE (child->widget))
|
|
{
|
|
GtkRequisition child_requisition;
|
|
gtk_widget_get_child_requisition (child->widget, &child_requisition);
|
|
|
|
if (box->homogeneous)
|
|
{
|
|
if (nvis_children == 1)
|
|
child_width = width;
|
|
else
|
|
child_width = extra;
|
|
|
|
nvis_children -= 1;
|
|
width -= extra;
|
|
}
|
|
else
|
|
{
|
|
child_width = child_requisition.width + child->padding * 2;
|
|
|
|
if (child->expand)
|
|
{
|
|
if (nexpand_children == 1)
|
|
child_width += width;
|
|
else
|
|
child_width += extra;
|
|
|
|
nexpand_children -= 1;
|
|
width -= extra;
|
|
}
|
|
}
|
|
|
|
if (child->fill)
|
|
{
|
|
child_allocation.width = MAX (1, (gint)child_width - (gint)child->padding * 2);
|
|
child_allocation.x = x + child->padding - child_width;
|
|
}
|
|
else
|
|
{
|
|
child_allocation.width = child_requisition.width;
|
|
child_allocation.x = x + (child_width - child_allocation.width) / 2 - child_width;
|
|
}
|
|
|
|
gtk_widget_size_allocate (child->widget, &child_allocation);
|
|
|
|
x -= (child_width + box->spacing);
|
|
}
|
|
}
|
|
}
|
|
}
|