1997-11-24 22:37:52 +00:00
|
|
|
/* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkalignment.h"
|
2001-02-17 00:11:03 +00:00
|
|
|
#include "gtkintl.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-06-28 10:07:37 +00:00
|
|
|
enum {
|
2001-02-17 00:11:03 +00:00
|
|
|
PROP_0,
|
|
|
|
|
|
|
|
PROP_XALIGN,
|
|
|
|
PROP_YALIGN,
|
|
|
|
PROP_XSCALE,
|
|
|
|
PROP_YSCALE,
|
|
|
|
|
|
|
|
PROP_LAST
|
1998-06-28 10:07:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_alignment_class_init (GtkAlignmentClass *klass);
|
|
|
|
static void gtk_alignment_init (GtkAlignment *alignment);
|
|
|
|
static void gtk_alignment_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition);
|
|
|
|
static void gtk_alignment_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
2001-02-17 00:11:03 +00:00
|
|
|
static void gtk_alignment_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
2001-03-07 14:49:21 +00:00
|
|
|
GParamSpec *pspec);
|
2001-02-17 00:11:03 +00:00
|
|
|
static void gtk_alignment_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
2001-03-07 14:49:21 +00:00
|
|
|
GParamSpec *pspec);
|
1998-06-28 10:07:37 +00:00
|
|
|
|
|
|
|
GtkType
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_alignment_get_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-28 10:07:37 +00:00
|
|
|
static GtkType alignment_type = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (!alignment_type)
|
|
|
|
{
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GtkTypeInfo alignment_info =
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
"GtkAlignment",
|
|
|
|
sizeof (GtkAlignment),
|
|
|
|
sizeof (GtkAlignmentClass),
|
|
|
|
(GtkClassInitFunc) gtk_alignment_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_alignment_init,
|
1998-07-04 15:31:30 +00:00
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
1998-06-28 07:46:10 +00:00
|
|
|
(GtkClassInitFunc) NULL,
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment_type = gtk_type_unique (GTK_TYPE_BIN, &alignment_info);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return alignment_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_alignment_class_init (GtkAlignmentClass *class)
|
|
|
|
{
|
2001-02-18 01:59:18 +00:00
|
|
|
GObjectClass *gobject_class;
|
1998-06-28 10:07:37 +00:00
|
|
|
GtkObjectClass *object_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
|
2001-02-18 01:59:18 +00:00
|
|
|
gobject_class = (GObjectClass*) class;
|
1998-06-28 10:07:37 +00:00
|
|
|
object_class = (GtkObjectClass*) class;
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class = (GtkWidgetClass*) class;
|
2001-02-18 01:59:18 +00:00
|
|
|
|
|
|
|
gobject_class->set_property = gtk_alignment_set_property;
|
|
|
|
gobject_class->get_property = gtk_alignment_get_property;
|
1998-06-28 10:07:37 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class->size_request = gtk_alignment_size_request;
|
|
|
|
widget_class->size_allocate = gtk_alignment_size_allocate;
|
2001-02-18 01:59:18 +00:00
|
|
|
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_XALIGN,
|
|
|
|
g_param_spec_float("xalign",
|
|
|
|
_("Horizontal alignment"),
|
|
|
|
_("Value between 0.0 and 1.0 to indicate X alignment"),
|
|
|
|
0.0,
|
|
|
|
1.0,
|
|
|
|
0.5,
|
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_YALIGN,
|
|
|
|
g_param_spec_float("yalign",
|
|
|
|
_("Vertical alignment"),
|
|
|
|
_("Value between 0.0 and 1.0 to indicate Y alignment"),
|
|
|
|
0.0,
|
|
|
|
1.0,
|
|
|
|
0.5,
|
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_XSCALE,
|
|
|
|
g_param_spec_float("xscale",
|
|
|
|
_("Horizontal scale"),
|
|
|
|
_("Value between 0.0 and 1.0 to indicate X scale"),
|
|
|
|
0.0,
|
|
|
|
1.0,
|
2001-09-10 14:59:49 +00:00
|
|
|
1.0,
|
2001-02-18 01:59:18 +00:00
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_YSCALE,
|
|
|
|
g_param_spec_float("yscale",
|
|
|
|
_("Vertical scale"),
|
|
|
|
_("Value between 0.0 and 1.0 to indicate Y scale"),
|
|
|
|
0.0,
|
|
|
|
1.0,
|
2001-09-10 14:59:49 +00:00
|
|
|
1.0,
|
2001-02-18 01:59:18 +00:00
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_alignment_init (GtkAlignment *alignment)
|
|
|
|
{
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
GTK_WIDGET_SET_FLAGS (alignment, GTK_NO_WINDOW);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
alignment->xalign = 0.5;
|
|
|
|
alignment->yalign = 0.5;
|
2001-09-10 14:59:49 +00:00
|
|
|
alignment->xscale = 1.0;
|
|
|
|
alignment->yscale = 1.0;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
GtkWidget*
|
|
|
|
gtk_alignment_new (gfloat xalign,
|
|
|
|
gfloat yalign,
|
|
|
|
gfloat xscale,
|
|
|
|
gfloat yscale)
|
|
|
|
{
|
|
|
|
GtkAlignment *alignment;
|
|
|
|
|
|
|
|
alignment = gtk_type_new (gtk_alignment_get_type ());
|
|
|
|
|
|
|
|
alignment->xalign = CLAMP (xalign, 0.0, 1.0);
|
|
|
|
alignment->yalign = CLAMP (yalign, 0.0, 1.0);
|
|
|
|
alignment->xscale = CLAMP (xscale, 0.0, 1.0);
|
|
|
|
alignment->yscale = CLAMP (yscale, 0.0, 1.0);
|
|
|
|
|
|
|
|
return GTK_WIDGET (alignment);
|
|
|
|
}
|
|
|
|
|
2001-03-07 14:49:21 +00:00
|
|
|
static void
|
|
|
|
gtk_alignment_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-28 10:07:37 +00:00
|
|
|
{
|
|
|
|
GtkAlignment *alignment;
|
2001-03-07 14:49:21 +00:00
|
|
|
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment = GTK_ALIGNMENT (object);
|
2001-03-07 14:49:21 +00:00
|
|
|
|
2001-02-17 00:11:03 +00:00
|
|
|
switch (prop_id)
|
1998-06-28 10:07:37 +00:00
|
|
|
{
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_XALIGN:
|
1998-06-28 10:07:37 +00:00
|
|
|
gtk_alignment_set (alignment,
|
2001-09-08 19:33:06 +00:00
|
|
|
g_value_get_float (value),
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment->yalign,
|
|
|
|
alignment->xscale,
|
|
|
|
alignment->yscale);
|
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_YALIGN:
|
1998-06-28 10:07:37 +00:00
|
|
|
gtk_alignment_set (alignment,
|
|
|
|
alignment->xalign,
|
2001-09-08 19:33:06 +00:00
|
|
|
g_value_get_float (value),
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment->xscale,
|
|
|
|
alignment->yscale);
|
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_XSCALE:
|
1998-06-28 10:07:37 +00:00
|
|
|
gtk_alignment_set (alignment,
|
|
|
|
alignment->xalign,
|
|
|
|
alignment->yalign,
|
2001-09-08 19:33:06 +00:00
|
|
|
g_value_get_float (value),
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment->yscale);
|
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_YSCALE:
|
1998-06-28 10:07:37 +00:00
|
|
|
gtk_alignment_set (alignment,
|
|
|
|
alignment->xalign,
|
|
|
|
alignment->yalign,
|
|
|
|
alignment->xscale,
|
2001-09-08 19:33:06 +00:00
|
|
|
g_value_get_float (value));
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
|
|
|
default:
|
2001-02-17 00:11:03 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-03-07 14:49:21 +00:00
|
|
|
static void
|
|
|
|
gtk_alignment_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-28 10:07:37 +00:00
|
|
|
{
|
|
|
|
GtkAlignment *alignment;
|
2001-03-07 14:49:21 +00:00
|
|
|
|
1998-06-28 10:07:37 +00:00
|
|
|
alignment = GTK_ALIGNMENT (object);
|
2001-02-17 00:11:03 +00:00
|
|
|
|
|
|
|
switch (prop_id)
|
1998-06-28 10:07:37 +00:00
|
|
|
{
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_XALIGN:
|
|
|
|
g_value_set_float(value, alignment->xalign);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_YALIGN:
|
|
|
|
g_value_set_float(value, alignment->yalign);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_XSCALE:
|
|
|
|
g_value_set_float(value, alignment->xscale);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
2001-02-17 00:11:03 +00:00
|
|
|
case PROP_YSCALE:
|
|
|
|
g_value_set_float(value, alignment->yscale);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
|
|
|
default:
|
2001-02-17 00:11:03 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-06-28 10:07:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_alignment_set (GtkAlignment *alignment,
|
|
|
|
gfloat xalign,
|
|
|
|
gfloat yalign,
|
|
|
|
gfloat xscale,
|
|
|
|
gfloat yscale)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
|
|
|
|
|
|
|
|
xalign = CLAMP (xalign, 0.0, 1.0);
|
|
|
|
yalign = CLAMP (yalign, 0.0, 1.0);
|
|
|
|
xscale = CLAMP (xscale, 0.0, 1.0);
|
|
|
|
yscale = CLAMP (yscale, 0.0, 1.0);
|
|
|
|
|
coalescing property notifies
2001-08-11 Hans Breuer <hans@breuer.org>
* gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,
gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c,
gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c,
gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c,
gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c,
gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies
* gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c,
gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all
GDK_TYPE_EVENT signals
* gtk/gtkalignment.c : removed 'direct allocation bug',
which Tim discovered while reading the patch
2001-08-11 20:27:36 +00:00
|
|
|
if ( (alignment->xalign != xalign)
|
|
|
|
|| (alignment->yalign != yalign)
|
|
|
|
|| (alignment->xscale != xscale)
|
|
|
|
|| (alignment->yscale != yscale))
|
2001-02-17 00:11:03 +00:00
|
|
|
{
|
coalescing property notifies
2001-08-11 Hans Breuer <hans@breuer.org>
* gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,
gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c,
gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c,
gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c,
gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c,
gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies
* gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c,
gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all
GDK_TYPE_EVENT signals
* gtk/gtkalignment.c : removed 'direct allocation bug',
which Tim discovered while reading the patch
2001-08-11 20:27:36 +00:00
|
|
|
g_object_freeze_notify (G_OBJECT (alignment));
|
|
|
|
if (alignment->xalign != xalign)
|
|
|
|
{
|
|
|
|
alignment->xalign = xalign;
|
|
|
|
g_object_notify (G_OBJECT(alignment), "xalign");
|
|
|
|
}
|
|
|
|
if (alignment->yalign != yalign)
|
|
|
|
{
|
|
|
|
alignment->yalign = yalign;
|
|
|
|
g_object_notify (G_OBJECT(alignment), "yalign");
|
|
|
|
}
|
|
|
|
if (alignment->xscale != xscale)
|
|
|
|
{
|
|
|
|
alignment->xscale = xscale;
|
|
|
|
g_object_notify (G_OBJECT(alignment), "xscale");
|
|
|
|
}
|
|
|
|
if (alignment->yscale != yscale)
|
|
|
|
{
|
|
|
|
alignment->yscale = yscale;
|
|
|
|
g_object_notify (G_OBJECT(alignment), "yscale");
|
|
|
|
}
|
|
|
|
g_object_thaw_notify (G_OBJECT (alignment));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
coalescing property notifies
2001-08-11 Hans Breuer <hans@breuer.org>
* gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,
gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c,
gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c,
gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c,
gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c,
gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies
* gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c,
gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all
GDK_TYPE_EVENT signals
* gtk/gtkalignment.c : removed 'direct allocation bug',
which Tim discovered while reading the patch
2001-08-11 20:27:36 +00:00
|
|
|
if (GTK_BIN (alignment)->child)
|
|
|
|
gtk_widget_queue_resize (GTK_BIN (alignment)->child);
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (alignment));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_alignment_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
|
|
|
GtkAlignment *alignment;
|
|
|
|
GtkBin *bin;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_ALIGNMENT (widget));
|
|
|
|
g_return_if_fail (requisition != NULL);
|
|
|
|
|
|
|
|
alignment = GTK_ALIGNMENT (widget);
|
|
|
|
bin = GTK_BIN (widget);
|
|
|
|
|
|
|
|
requisition->width = GTK_CONTAINER (widget)->border_width * 2;
|
|
|
|
requisition->height = GTK_CONTAINER (widget)->border_width * 2;
|
|
|
|
|
|
|
|
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
|
|
|
|
{
|
1999-02-10 02:35:09 +00:00
|
|
|
GtkRequisition child_requisition;
|
|
|
|
|
|
|
|
gtk_widget_size_request (bin->child, &child_requisition);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1999-02-10 02:35:09 +00:00
|
|
|
requisition->width += child_requisition.width;
|
|
|
|
requisition->height += child_requisition.height;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_alignment_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
GtkAlignment *alignment;
|
|
|
|
GtkBin *bin;
|
|
|
|
GtkAllocation child_allocation;
|
1999-02-10 02:35:09 +00:00
|
|
|
GtkRequisition child_requisition;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint width, height;
|
|
|
|
gint x, y;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_ALIGNMENT (widget));
|
|
|
|
g_return_if_fail (allocation != NULL);
|
|
|
|
|
|
|
|
widget->allocation = *allocation;
|
|
|
|
alignment = GTK_ALIGNMENT (widget);
|
|
|
|
bin = GTK_BIN (widget);
|
1998-06-28 10:07:37 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
|
|
|
|
{
|
1999-02-10 02:35:09 +00:00
|
|
|
gtk_widget_get_child_requisition (bin->child, &child_requisition);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
x = GTK_CONTAINER (alignment)->border_width;
|
|
|
|
y = GTK_CONTAINER (alignment)->border_width;
|
1998-04-03 23:17:16 +00:00
|
|
|
width = MAX (allocation->width - 2 * x, 0);
|
|
|
|
height = MAX (allocation->height - 2 * y, 0);
|
1998-06-28 10:07:37 +00:00
|
|
|
|
1999-02-10 02:35:09 +00:00
|
|
|
if (width > child_requisition.width)
|
|
|
|
child_allocation.width = (child_requisition.width *
|
1997-11-24 22:37:52 +00:00
|
|
|
(1.0 - alignment->xscale) +
|
|
|
|
width * alignment->xscale);
|
|
|
|
else
|
|
|
|
child_allocation.width = width;
|
1998-06-28 10:07:37 +00:00
|
|
|
|
1999-02-10 02:35:09 +00:00
|
|
|
if (height > child_requisition.height)
|
|
|
|
child_allocation.height = (child_requisition.height *
|
1998-06-28 10:07:37 +00:00
|
|
|
(1.0 - alignment->yscale) +
|
|
|
|
height * alignment->yscale);
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
|
|
|
child_allocation.height = height;
|
|
|
|
|
|
|
|
child_allocation.x = alignment->xalign * (width - child_allocation.width) + allocation->x + x;
|
|
|
|
child_allocation.y = alignment->yalign * (height - child_allocation.height) + allocation->y + y;
|
|
|
|
|
|
|
|
gtk_widget_size_allocate (bin->child, &child_allocation);
|
|
|
|
}
|
|
|
|
}
|