gtk2/gtk/gtkhbox.c
Owen Taylor 4851efe296 configure.in acheader.h gdk/gdkwindow.c Check for Shape extension both on
Sun May  3 13:38:22 1998  Owen Taylor  <otaylor@gtk.org>

	* configure.in acheader.h gdk/gdkwindow.c
	Check for Shape extension both on the client and server
	side. (And, more importantly, check for the shape extension
	so we may include -lXext even when compiling with --disable-xshm)

	Don't set override_redirect on all shaped windows. It isn't
	necessary.

	* gdk/gdkwindow.c: Set ->colormap to NULL for root
	and foreign windows. Use this to check if we
	need to get the colormap from X.

Fri May  1 22:32:47 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkbutton.c (gtk_button_paint): Draw the areas
	between the default and the button always in GTK_STATE_NORMAL.

	* gtk/gtkrange.c (gtk_range_style_set): Added a style_set
	callback.

Fri May  1 16:40:57 1998  Owen Taylor  <otaylor@gtk.org>

	* gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpmp[_d]):
	  Fix a buffer overflow on pixmaps that claim to have
	  more than 31 characters per pixel.

	  (gdk_pixmap_read_string): Don't wrap around strings longer
 	  than half of address space ;-)

	* gtk/gtk[vh]ruler.c gtk/gtkinputdialog.c: Expand some buffers
	that were used for printing integers.

	* */* (almost):

	Style: All
	  int foo () { ... }
	changed to
	  int foo (void) { ... }

^^^^^^^ This is why some many files changed

	Even where there were proper prototypes elsewhere.

	* gdk/gxid.c (handle_claim_device): Some extra checks.
	It isn't safe against being fed bad X id's, but at
	least it should be safe against deleting all your
	files.
1998-05-03 22:41:32 +00:00

309 lines
7.5 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);
guint
gtk_hbox_get_type (void)
{
static guint hbox_type = 0;
if (!hbox_type)
{
GtkTypeInfo hbox_info =
{
"GtkHBox",
sizeof (GtkHBox),
sizeof (GtkHBoxClass),
(GtkClassInitFunc) gtk_hbox_class_init,
(GtkObjectInitFunc) gtk_hbox_init,
(GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL,
};
hbox_type = gtk_type_unique (gtk_box_get_type (), &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 (gint 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))
{
gtk_widget_size_request (child->widget, &child->widget->requisition);
if (box->homogeneous)
{
width = child->widget->requisition.width + child->padding * 2;
requisition->width = MAX (requisition->width, width);
}
else
{
requisition->width += child->widget->requisition.width + child->padding * 2;
}
requisition->height = MAX (requisition->height, child->widget->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, allocation->height - 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
{
child_width = child->widget->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, child_width - child->padding * 2);
child_allocation.x = x + child->padding;
}
else
{
child_allocation.width = child->widget->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))
{
if (box->homogeneous)
{
if (nvis_children == 1)
child_width = width;
else
child_width = extra;
nvis_children -= 1;
width -= extra;
}
else
{
child_width = child->widget->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, child_width - child->padding * 2);
child_allocation.x = x + child->padding - child_width;
}
else
{
child_allocation.width = child->widget->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);
}
}
}
}