gtk2/gtk/gtkvbbox.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

278 lines
6.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 "gtkvbbox.h"
static void gtk_vbutton_box_class_init (GtkVButtonBoxClass *klass);
static void gtk_vbutton_box_init (GtkVButtonBox *box);
static void gtk_vbutton_box_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_vbutton_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gint default_spacing = 10;
static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
guint
gtk_vbutton_box_get_type (void)
{
static guint vbutton_box_type = 0;
if (!vbutton_box_type)
{
GtkTypeInfo vbutton_box_info =
{
"GtkVButtonBox",
sizeof (GtkVButtonBox),
sizeof (GtkVButtonBoxClass),
(GtkClassInitFunc) gtk_vbutton_box_class_init,
(GtkObjectInitFunc) gtk_vbutton_box_init,
(GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL,
};
vbutton_box_type = gtk_type_unique (gtk_button_box_get_type (), &vbutton_box_info);
}
return vbutton_box_type;
}
static void
gtk_vbutton_box_class_init (GtkVButtonBoxClass *class)
{
GtkWidgetClass *widget_class;
widget_class = (GtkWidgetClass*) class;
widget_class->size_request = gtk_vbutton_box_size_request;
widget_class->size_allocate = gtk_vbutton_box_size_allocate;
}
static void
gtk_vbutton_box_init (GtkVButtonBox *vbutton_box)
{
/* button_box_init has done everything allready */
}
GtkWidget*
gtk_vbutton_box_new (void)
{
GtkVButtonBox *vbutton_box;
vbutton_box = gtk_type_new (gtk_vbutton_box_get_type ());
return GTK_WIDGET (vbutton_box);
}
/* set default value for spacing */
void gtk_vbutton_box_set_spacing_default (gint spacing)
{
default_spacing = spacing;
}
/* set default value for layout style */
void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout)
{
g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE &&
layout <= GTK_BUTTONBOX_END);
default_layout_style = layout;
}
/* get default value for spacing */
gint gtk_vbutton_box_get_spacing_default (void)
{
return default_spacing;
}
/* get default value for layout style */
GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void)
{
return default_layout_style;
}
static void
gtk_vbutton_box_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBox *box;
GtkButtonBox *bbox;
gint nvis_children;
gint child_width;
gint child_height;
gint spacing;
GtkButtonBoxStyle layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VBUTTON_BOX (widget));
g_return_if_fail (requisition != NULL);
box = GTK_BOX (widget);
bbox = GTK_BUTTON_BOX (widget);
spacing = bbox->spacing != GTK_BUTTONBOX_DEFAULT
? bbox->spacing : default_spacing;
layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE
? bbox->layout_style : default_layout_style;
gtk_button_box_child_requisition (widget,
&nvis_children,
&child_width,
&child_height);
if (nvis_children == 0)
{
requisition->width = 0;
requisition->height = 0;
}
else
{
switch (layout)
{
case GTK_BUTTONBOX_SPREAD:
requisition->height =
nvis_children*child_height + ((nvis_children+1)*spacing);
break;
case GTK_BUTTONBOX_EDGE:
case GTK_BUTTONBOX_START:
case GTK_BUTTONBOX_END:
requisition->height =
nvis_children*child_height + ((nvis_children-1)*spacing);
break;
default:
g_assert_not_reached();
break;
}
requisition->width = child_width;
}
requisition->width += GTK_CONTAINER (box)->border_width * 2;
requisition->height += GTK_CONTAINER (box)->border_width * 2;
}
static void
gtk_vbutton_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkButtonBox *box;
GtkVButtonBox *hbox;
GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
gint child_width;
gint child_height;
gint x = 0;
gint y = 0;
gint height;
gint childspace;
gint childspacing = 0;
GtkButtonBoxStyle layout;
gint spacing;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VBUTTON_BOX (widget));
g_return_if_fail (allocation != NULL);
box = GTK_BUTTON_BOX (widget);
hbox = GTK_VBUTTON_BOX (widget);
spacing = box->spacing != GTK_BUTTONBOX_DEFAULT
? box->spacing : default_spacing;
layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE
? box->layout_style : default_layout_style;
gtk_button_box_child_requisition (widget,
&nvis_children,
&child_width,
&child_height);
widget->allocation = *allocation;
height = allocation->height - GTK_CONTAINER (box)->border_width*2;
switch (layout)
{
case GTK_BUTTONBOX_SPREAD:
childspacing = (height - (nvis_children*child_height)) / (nvis_children+1);
y = allocation->y + GTK_CONTAINER (box)->border_width + childspacing;
break;
case GTK_BUTTONBOX_EDGE:
if (nvis_children >= 2)
{
childspacing =
(height - (nvis_children*child_height)) / (nvis_children-1);
y = allocation->y + GTK_CONTAINER (box)->border_width;
}
else
{
/* one or zero children, just center */
childspacing = height;
y = allocation->y + (allocation->height - child_height) / 2;
}
break;
case GTK_BUTTONBOX_START:
childspacing = spacing;
y = allocation->y + GTK_CONTAINER (box)->border_width;
break;
case GTK_BUTTONBOX_END:
childspacing = spacing;
y = allocation->x + allocation->height - child_height * nvis_children
- spacing * (nvis_children-1)
- GTK_CONTAINER (box)->border_width;
break;
default:
g_assert_not_reached();
break;
}
x = allocation->x + (allocation->width - child_width) / 2;
childspace = child_height + childspacing;
children = GTK_BOX (box)->children;
while (children)
{
child = children->data;
children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget))
{
child_allocation.width = child_width;
child_allocation.height = child_height;
child_allocation.x = x;
child_allocation.y = y;
gtk_widget_size_allocate (child->widget, &child_allocation);
y += childspace;
}
}
}