2008-07-01 22:57:50 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
1997-11-24 22:37:52 +00:00
|
|
|
* 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
|
2009-06-25 11:30:15 +00:00
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
1999-02-24 07:37:18 +00:00
|
|
|
*/
|
|
|
|
|
2010-04-28 16:11:23 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gtkbbox
|
|
|
|
* @Short_description: Base class for GtkHButtonBox and GtkVButtonBox
|
|
|
|
* @Title: GtkButtonBox
|
|
|
|
* @See_also: #GtkVButtonBox, #GtkHButtonBox
|
|
|
|
*
|
2010-09-01 23:15:59 +00:00
|
|
|
* The primary purpose of this class is to keep track of the various
|
|
|
|
* properties of #GtkHButtonBox and #GtkVButtonBox widgets.
|
2010-04-28 16:11:23 +00:00
|
|
|
*
|
|
|
|
* gtk_button_box_get_layout() and gtk_button_box_set_layout() retrieve and
|
|
|
|
* alter the method used to spread the buttons in a button box across the
|
|
|
|
* container, respectively.
|
|
|
|
*
|
|
|
|
* The main purpose of GtkButtonBox is to make sure the children have all the
|
2010-09-01 23:15:59 +00:00
|
|
|
* same size. GtkButtonBox gives all children the same size, but it does allow
|
|
|
|
* 'outliers' to keep their own larger size. To force all children to be
|
|
|
|
* strictly the same size without exceptions, you can set the
|
|
|
|
* #GtkButtonBox::homogeneous property to %TRUE.
|
2010-04-28 16:11:23 +00:00
|
|
|
*/
|
|
|
|
|
2008-06-22 14:28:52 +00:00
|
|
|
#include "config.h"
|
2010-09-09 13:35:58 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkbbox.h"
|
2010-09-09 13:35:58 +00:00
|
|
|
|
2009-06-02 12:01:19 +00:00
|
|
|
#include "gtkorientable.h"
|
2005-03-22 02:14:55 +00:00
|
|
|
#include "gtkprivate.h"
|
2010-09-09 13:35:58 +00:00
|
|
|
#include "gtksizerequest.h"
|
2010-09-18 23:57:32 +00:00
|
|
|
#include "gtktypeutils.h"
|
2010-09-09 13:35:58 +00:00
|
|
|
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#include "gtkintl.h"
|
2010-07-09 17:22:23 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
struct _GtkButtonBoxPrivate
|
2010-05-24 19:35:01 +00:00
|
|
|
{
|
|
|
|
GtkButtonBoxStyle layout_style;
|
|
|
|
};
|
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
enum {
|
|
|
|
PROP_0,
|
2008-05-21 11:30:06 +00:00
|
|
|
PROP_LAYOUT_STYLE
|
2001-05-17 16:22:06 +00:00
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
enum {
|
|
|
|
CHILD_PROP_0,
|
|
|
|
CHILD_PROP_SECONDARY
|
|
|
|
};
|
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
#define GTK_BOX_SECONDARY_CHILD "gtk-box-secondary-child"
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
static void gtk_button_box_set_property (GObject *object,
|
2010-08-13 03:22:07 +00:00
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
2001-07-06 02:10:32 +00:00
|
|
|
static void gtk_button_box_get_property (GObject *object,
|
2010-08-13 03:22:07 +00:00
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
2010-10-27 00:57:40 +00:00
|
|
|
static void gtk_button_box_get_preferred_width (GtkWidget *widget,
|
|
|
|
gint *minimum,
|
|
|
|
gint *natural);
|
|
|
|
static void gtk_button_box_get_preferred_height (GtkWidget *widget,
|
|
|
|
gint *minimum,
|
|
|
|
gint *natural);
|
2009-06-25 11:30:15 +00:00
|
|
|
static void gtk_button_box_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
2010-07-14 20:23:14 +00:00
|
|
|
static void gtk_button_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
2001-07-06 02:10:32 +00:00
|
|
|
static void gtk_button_box_set_child_property (GtkContainer *container,
|
2010-08-13 03:22:07 +00:00
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
2001-07-06 02:10:32 +00:00
|
|
|
static void gtk_button_box_get_child_property (GtkContainer *container,
|
2010-08-13 03:22:07 +00:00
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#define DEFAULT_CHILD_MIN_WIDTH 85
|
|
|
|
#define DEFAULT_CHILD_MIN_HEIGHT 27
|
2001-04-30 23:23:54 +00:00
|
|
|
#define DEFAULT_CHILD_IPAD_X 4
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
#define DEFAULT_CHILD_IPAD_Y 0
|
2010-08-13 03:22:07 +00:00
|
|
|
#define DEFAULT_LAYOUT_STYLE GTK_BUTTONBOX_EDGE
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-05-25 22:55:15 +00:00
|
|
|
G_DEFINE_TYPE (GtkButtonBox, gtk_button_box, GTK_TYPE_BOX)
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_class_init (GtkButtonBoxClass *class)
|
|
|
|
{
|
|
|
|
GtkWidgetClass *widget_class;
|
2001-05-17 16:22:06 +00:00
|
|
|
GObjectClass *gobject_class;
|
2001-07-06 02:10:32 +00:00
|
|
|
GtkContainerClass *container_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
gobject_class = G_OBJECT_CLASS (class);
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class = (GtkWidgetClass*) class;
|
2001-07-06 02:10:32 +00:00
|
|
|
container_class = (GtkContainerClass*) class;
|
2001-03-07 21:10:44 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
gobject_class->set_property = gtk_button_box_set_property;
|
|
|
|
gobject_class->get_property = gtk_button_box_get_property;
|
2001-07-06 02:10:32 +00:00
|
|
|
|
2010-10-27 00:57:40 +00:00
|
|
|
widget_class->get_preferred_width = gtk_button_box_get_preferred_width;
|
|
|
|
widget_class->get_preferred_height = gtk_button_box_get_preferred_height;
|
2009-06-02 12:01:19 +00:00
|
|
|
widget_class->size_allocate = gtk_button_box_size_allocate;
|
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
container_class->remove = gtk_button_box_remove;
|
2001-07-06 02:10:32 +00:00
|
|
|
container_class->set_child_property = gtk_button_box_set_child_property;
|
|
|
|
container_class->get_child_property = gtk_button_box_get_child_property;
|
2009-06-25 11:30:15 +00:00
|
|
|
|
2001-03-07 21:10:44 +00:00
|
|
|
/* FIXME we need to override the "spacing" property on GtkBox once
|
|
|
|
* libgobject allows that.
|
|
|
|
*/
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
2010-08-13 03:22:07 +00:00
|
|
|
g_param_spec_int ("child-min-width",
|
|
|
|
P_("Minimum child width"),
|
|
|
|
P_("Minimum width of buttons inside the box"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
DEFAULT_CHILD_MIN_WIDTH,
|
2010-08-13 03:22:07 +00:00
|
|
|
GTK_PARAM_READABLE));
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
2010-08-13 03:22:07 +00:00
|
|
|
g_param_spec_int ("child-min-height",
|
|
|
|
P_("Minimum child height"),
|
|
|
|
P_("Minimum height of buttons inside the box"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
DEFAULT_CHILD_MIN_HEIGHT,
|
2010-08-13 03:22:07 +00:00
|
|
|
GTK_PARAM_READABLE));
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
2010-08-13 03:22:07 +00:00
|
|
|
g_param_spec_int ("child-internal-pad-x",
|
|
|
|
P_("Child internal width padding"),
|
|
|
|
P_("Amount to increase child's size on either side"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
DEFAULT_CHILD_IPAD_X,
|
2010-08-13 03:22:07 +00:00
|
|
|
GTK_PARAM_READABLE));
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
|
|
|
|
gtk_widget_class_install_style_property (widget_class,
|
2010-08-13 03:22:07 +00:00
|
|
|
g_param_spec_int ("child-internal-pad-y",
|
|
|
|
P_("Child internal height padding"),
|
|
|
|
P_("Amount to increase child's size on the top and bottom"),
|
|
|
|
0,
|
|
|
|
G_MAXINT,
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
DEFAULT_CHILD_IPAD_Y,
|
2010-08-13 03:22:07 +00:00
|
|
|
GTK_PARAM_READABLE));
|
2001-05-17 16:22:06 +00:00
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_LAYOUT_STYLE,
|
2005-03-09 06:15:13 +00:00
|
|
|
g_param_spec_enum ("layout-style",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Layout style"),
|
2010-08-28 12:51:41 +00:00
|
|
|
P_("How to lay out the buttons in the box. Possible values are: spread, edge, start and end"),
|
2010-08-13 03:22:07 +00:00
|
|
|
GTK_TYPE_BUTTON_BOX_STYLE,
|
|
|
|
DEFAULT_LAYOUT_STYLE,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
2001-07-06 02:10:32 +00:00
|
|
|
|
|
|
|
gtk_container_class_install_child_property (container_class,
|
2010-08-13 03:22:07 +00:00
|
|
|
CHILD_PROP_SECONDARY,
|
|
|
|
g_param_spec_boolean ("secondary",
|
|
|
|
P_("Secondary"),
|
|
|
|
P_("If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"),
|
|
|
|
FALSE,
|
|
|
|
GTK_PARAM_READWRITE));
|
2010-05-24 19:35:01 +00:00
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
g_type_class_add_private (class, sizeof (GtkButtonBoxPrivate));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_init (GtkButtonBox *button_box)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv;
|
2010-05-24 19:35:01 +00:00
|
|
|
|
|
|
|
button_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (button_box,
|
|
|
|
GTK_TYPE_BUTTON_BOX,
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate);
|
2010-05-24 19:35:01 +00:00
|
|
|
priv = button_box->priv;
|
|
|
|
|
|
|
|
gtk_box_set_spacing (GTK_BOX (button_box), 0);
|
2010-08-13 03:22:07 +00:00
|
|
|
priv->layout_style = DEFAULT_LAYOUT_STYLE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
static void
|
2010-08-13 03:22:07 +00:00
|
|
|
gtk_button_box_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2001-05-17 16:22:06 +00:00
|
|
|
{
|
2009-06-25 11:30:15 +00:00
|
|
|
switch (prop_id)
|
2001-05-17 16:22:06 +00:00
|
|
|
{
|
|
|
|
case PROP_LAYOUT_STYLE:
|
|
|
|
gtk_button_box_set_layout (GTK_BUTTON_BOX (object),
|
2010-08-13 03:22:07 +00:00
|
|
|
g_value_get_enum (value));
|
2001-05-17 16:22:06 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-08-13 03:22:07 +00:00
|
|
|
gtk_button_box_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2001-05-17 16:22:06 +00:00
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv = GTK_BUTTON_BOX (object)->priv;
|
2010-05-24 19:35:01 +00:00
|
|
|
|
2001-05-17 16:22:06 +00:00
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_LAYOUT_STYLE:
|
2010-05-24 19:35:01 +00:00
|
|
|
g_value_set_enum (value, priv->layout_style);
|
2001-05-17 16:22:06 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
static void
|
2010-08-13 03:22:07 +00:00
|
|
|
gtk_button_box_set_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2001-07-06 02:10:32 +00:00
|
|
|
{
|
|
|
|
switch (property_id)
|
|
|
|
{
|
|
|
|
case CHILD_PROP_SECONDARY:
|
|
|
|
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (container), child,
|
2010-08-13 03:22:07 +00:00
|
|
|
g_value_get_boolean (value));
|
2001-07-06 02:10:32 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_get_child_property (GtkContainer *container,
|
2010-08-13 03:22:07 +00:00
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
2001-07-06 02:10:32 +00:00
|
|
|
{
|
|
|
|
switch (property_id)
|
|
|
|
{
|
|
|
|
case CHILD_PROP_SECONDARY:
|
2010-08-13 03:22:07 +00:00
|
|
|
g_value_set_boolean (value,
|
|
|
|
gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (container),
|
|
|
|
child));
|
2001-07-06 02:10:32 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2001-05-17 16:22:06 +00:00
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
|
|
|
/* clear is_secondary flag in case the widget
|
2010-08-13 03:22:07 +00:00
|
|
|
* is added to another container
|
|
|
|
*/
|
2010-07-14 20:23:14 +00:00
|
|
|
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (container),
|
|
|
|
widget,
|
|
|
|
FALSE);
|
|
|
|
|
|
|
|
GTK_CONTAINER_CLASS (gtk_button_box_parent_class)->remove (container, widget);
|
|
|
|
}
|
|
|
|
|
2010-04-28 16:11:23 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_set_layout:
|
|
|
|
* @widget: a #GtkButtonBox
|
|
|
|
* @layout_style: the new layout style
|
|
|
|
*
|
|
|
|
* Changes the way buttons are arranged in their container.
|
|
|
|
*/
|
2001-10-27 00:41:12 +00:00
|
|
|
void
|
2010-08-13 03:22:07 +00:00
|
|
|
gtk_button_box_set_layout (GtkButtonBox *widget,
|
2001-10-27 00:41:12 +00:00
|
|
|
GtkButtonBoxStyle layout_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv;
|
2010-05-24 19:35:01 +00:00
|
|
|
|
2002-01-30 22:29:03 +00:00
|
|
|
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
|
1998-02-25 18:36:39 +00:00
|
|
|
|
2010-05-24 19:35:01 +00:00
|
|
|
priv = widget->priv;
|
|
|
|
|
|
|
|
if (priv->layout_style != layout_style)
|
2001-05-17 16:22:06 +00:00
|
|
|
{
|
2010-05-24 19:35:01 +00:00
|
|
|
priv->layout_style = layout_style;
|
2005-03-26 05:49:15 +00:00
|
|
|
g_object_notify (G_OBJECT (widget), "layout-style");
|
2001-05-17 16:22:06 +00:00
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (widget));
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2010-04-28 16:11:23 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_get_layout:
|
|
|
|
* @widget: a #GtkButtonBox
|
|
|
|
*
|
|
|
|
* Retrieves the method being used to arrange the buttons in a button box.
|
|
|
|
*
|
2010-08-28 12:51:41 +00:00
|
|
|
* Returns: the method used to lay out buttons in @widget.
|
2010-04-28 16:11:23 +00:00
|
|
|
*/
|
2010-08-13 03:22:07 +00:00
|
|
|
GtkButtonBoxStyle
|
2001-07-06 02:10:32 +00:00
|
|
|
gtk_button_box_get_layout (GtkButtonBox *widget)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-08-13 03:22:07 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_BUTTON_BOX (widget), DEFAULT_LAYOUT_STYLE);
|
|
|
|
|
2010-05-24 19:35:01 +00:00
|
|
|
return widget->priv->layout_style;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2003-07-18 23:08:51 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_get_child_secondary:
|
|
|
|
* @widget: a #GtkButtonBox
|
2010-08-13 03:22:07 +00:00
|
|
|
* @child: a child of @widget
|
|
|
|
*
|
2003-07-18 23:08:51 +00:00
|
|
|
* Returns whether @child should appear in a secondary group of children.
|
|
|
|
*
|
|
|
|
* Return value: whether @child should appear in a secondary group of children.
|
|
|
|
*
|
|
|
|
* Since: 2.4
|
|
|
|
**/
|
2010-08-13 03:22:07 +00:00
|
|
|
gboolean
|
2003-07-18 23:08:51 +00:00
|
|
|
gtk_button_box_get_child_secondary (GtkButtonBox *widget,
|
2010-08-13 03:22:07 +00:00
|
|
|
GtkWidget *child)
|
2003-07-18 23:08:51 +00:00
|
|
|
{
|
2003-07-20 15:50:14 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_BUTTON_BOX (widget), FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE);
|
2003-07-18 23:08:51 +00:00
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
return (g_object_get_data (G_OBJECT (child), GTK_BOX_SECONDARY_CHILD) != NULL);
|
2003-07-18 23:08:51 +00:00
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_set_child_secondary
|
|
|
|
* @widget: a #GtkButtonBox
|
|
|
|
* @child: a child of @widget
|
|
|
|
* @is_secondary: if %TRUE, the @child appears in a secondary group of the
|
|
|
|
* button box.
|
|
|
|
*
|
|
|
|
* Sets whether @child should appear in a secondary group of children.
|
|
|
|
* A typical use of a secondary child is the help button in a dialog.
|
|
|
|
*
|
|
|
|
* This group appears after the other children if the style
|
|
|
|
* is %GTK_BUTTONBOX_START, %GTK_BUTTONBOX_SPREAD or
|
2005-02-01 18:15:09 +00:00
|
|
|
* %GTK_BUTTONBOX_EDGE, and before the other children if the style
|
2001-07-06 02:10:32 +00:00
|
|
|
* is %GTK_BUTTONBOX_END. For horizontal button boxes, the definition
|
2001-12-06 21:38:12 +00:00
|
|
|
* of before/after depends on direction of the widget (see
|
|
|
|
* gtk_widget_set_direction()). If the style is %GTK_BUTTONBOX_START
|
|
|
|
* or %GTK_BUTTONBOX_END, then the secondary children are aligned at
|
2001-07-06 02:10:32 +00:00
|
|
|
* the other end of the button box from the main children. For the
|
|
|
|
* other styles, they appear immediately next to the main children.
|
|
|
|
**/
|
2010-08-13 03:22:07 +00:00
|
|
|
void
|
|
|
|
gtk_button_box_set_child_secondary (GtkButtonBox *widget,
|
|
|
|
GtkWidget *child,
|
|
|
|
gboolean is_secondary)
|
2001-07-06 02:10:32 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
|
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
2010-08-11 21:18:18 +00:00
|
|
|
g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (widget));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
g_object_set_data (G_OBJECT (child),
|
|
|
|
GTK_BOX_SECONDARY_CHILD,
|
|
|
|
is_secondary ? GINT_TO_POINTER (1) : NULL);
|
2001-07-06 02:10:32 +00:00
|
|
|
gtk_widget_child_notify (child, "secondary");
|
|
|
|
|
2010-08-13 03:22:07 +00:00
|
|
|
if (gtk_widget_get_visible (GTK_WIDGET (widget)) &&
|
|
|
|
gtk_widget_get_visible (child))
|
2001-07-06 02:10:32 +00:00
|
|
|
gtk_widget_queue_resize (child);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-13 03:22:07 +00:00
|
|
|
/* Ask children how much space they require and round up
|
2010-08-22 04:30:31 +00:00
|
|
|
* to match minimum size and internal padding.
|
|
|
|
* Returns the size each single child should have.
|
|
|
|
*/
|
2010-08-13 04:54:31 +00:00
|
|
|
static void
|
2010-08-22 04:30:31 +00:00
|
|
|
gtk_button_box_child_requisition (GtkWidget *widget,
|
|
|
|
gint *nvis_children,
|
|
|
|
gint *nvis_secondaries,
|
|
|
|
gint **widths,
|
|
|
|
gint **heights)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkButtonBox *bbox;
|
2010-06-02 04:28:22 +00:00
|
|
|
GList *children, *list;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint nchildren;
|
2001-07-06 02:10:32 +00:00
|
|
|
gint nsecondaries;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint needed_width;
|
|
|
|
gint needed_height;
|
2010-08-22 04:30:31 +00:00
|
|
|
gint avg_w, avg_h;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkRequisition child_requisition;
|
|
|
|
gint ipad_w;
|
|
|
|
gint ipad_h;
|
|
|
|
gint child_min_width;
|
|
|
|
gint child_min_height;
|
|
|
|
gint ipad_x;
|
|
|
|
gint ipad_y;
|
2010-08-22 04:30:31 +00:00
|
|
|
gboolean homogeneous;
|
|
|
|
gint i;
|
2010-08-13 03:22:07 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
|
|
|
|
|
|
|
|
bbox = GTK_BUTTON_BOX (widget);
|
2010-05-24 19:35:01 +00:00
|
|
|
priv = bbox->priv;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
homogeneous = gtk_box_get_homogeneous (GTK_BOX (widget));
|
|
|
|
|
fix warning
2001-04-27 Havoc Pennington <hp@redhat.com>
* gtk/gtkcombo.c (gtk_combo_popup_button_press): fix warning
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): make messages selectable
* gtk/gtkentry.c (gtk_entry_real_insert_text): don't strip
line/para separators
(gtk_entry_create_layout): set single paragraph mode on the layout
* gtk/gtkbutton.c (gtk_button_new_from_stock): don't put much
spacing between the image and label; instead, inside a button box
the button will get extra space that will go there, but if people
configure button box for 0 chubbiness, then there's no spacing.
* gtk/gtkbbox.c (gtk_button_box_class_init): Make child ipadding
and min/max size style properties, so people can tune their
chubbiness.
* tests/testgtk.c (make_toolbar): remove calls to removed toolbar
functions
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Make space_size,
space_style, and button_relief into style properties, remove
functions for setting them
* gtk/gtkmenu.c (gtk_menu_key_press): handle menu bar accel to pop
it back down
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): free boxed
types from gtk_widget_style_get
* gtk/gtkmenubar.c (gtk_menu_bar_set_shadow_type): Remove, replace
with a style property.
* gdk/x11/gdkevents-x11.c: namespace the settings
* gtk/gtkmenubar.c: Add F10 accelerator to move between menubars.
* gtk/gtksettings.c (gtk_settings_class_init): remove code with
side effects from inside g_assert(), so that G_DISABLE_ASSERT can
be used. Also, translate doc strings for settings. Also, namespace
the double-click-time property. Also, remove bell properties crap.
2001-04-28 00:12:47 +00:00
|
|
|
gtk_widget_style_get (widget,
|
2010-08-13 04:53:49 +00:00
|
|
|
"child-min-width", &child_min_width,
|
|
|
|
"child-min-height", &child_min_height,
|
|
|
|
"child-internal-pad-x", &ipad_x,
|
|
|
|
"child-internal-pad-y", &ipad_y,
|
2010-08-13 03:22:07 +00:00
|
|
|
NULL);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
nchildren = 0;
|
2001-07-06 02:10:32 +00:00
|
|
|
nsecondaries = 0;
|
2010-07-26 13:24:15 +00:00
|
|
|
list = children = _gtk_box_get_children (GTK_BOX (bbox));
|
1997-11-24 22:37:52 +00:00
|
|
|
needed_width = child_min_width;
|
2010-08-13 03:22:07 +00:00
|
|
|
needed_height = child_min_height;
|
1997-11-24 22:37:52 +00:00
|
|
|
ipad_w = ipad_x * 2;
|
|
|
|
ipad_h = ipad_y * 2;
|
2010-08-22 04:30:31 +00:00
|
|
|
|
|
|
|
avg_w = avg_h = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
while (children)
|
|
|
|
{
|
2010-07-14 20:23:14 +00:00
|
|
|
GtkWidget *child;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
if (gtk_widget_get_visible (child))
|
2010-08-13 03:22:07 +00:00
|
|
|
{
|
|
|
|
nchildren += 1;
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_size (child,
|
|
|
|
&child_requisition, NULL);
|
2010-08-22 04:30:31 +00:00
|
|
|
avg_w += child_requisition.width + ipad_w;
|
|
|
|
avg_h += child_requisition.height + ipad_h;
|
|
|
|
}
|
|
|
|
}
|
2010-08-25 04:29:27 +00:00
|
|
|
avg_w /= MAX (nchildren, 1);
|
|
|
|
avg_h /= MAX (nchildren, 1);
|
2010-08-22 04:30:31 +00:00
|
|
|
|
|
|
|
*widths = g_new (gint, nchildren);
|
|
|
|
*heights = g_new (gint, nchildren);
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
children = list;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
GtkWidget *child;
|
|
|
|
gboolean is_secondary;
|
2010-08-13 03:22:07 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (gtk_widget_get_visible (child))
|
|
|
|
{
|
|
|
|
is_secondary = gtk_button_box_get_child_secondary (bbox, child);
|
2010-08-13 03:22:07 +00:00
|
|
|
if (is_secondary)
|
|
|
|
nsecondaries++;
|
2010-08-22 04:30:31 +00:00
|
|
|
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_size (child, &child_requisition, NULL);
|
2010-08-22 04:30:31 +00:00
|
|
|
|
2010-08-25 04:29:27 +00:00
|
|
|
if (homogeneous || (child_requisition.width + ipad_w < avg_w * 1.5))
|
2010-08-22 04:30:31 +00:00
|
|
|
{
|
|
|
|
(*widths)[i] = -1;
|
|
|
|
if (child_requisition.width + ipad_w > needed_width)
|
|
|
|
needed_width = child_requisition.width + ipad_w;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
(*widths)[i] = child_requisition.width + ipad_w;
|
|
|
|
}
|
|
|
|
|
2010-08-25 04:29:27 +00:00
|
|
|
if (homogeneous || (child_requisition.height + ipad_h < avg_h * 1.5))
|
2010-08-22 04:30:31 +00:00
|
|
|
{
|
|
|
|
(*heights)[i] = -1;
|
|
|
|
if (child_requisition.height + ipad_h > needed_height)
|
|
|
|
needed_height = child_requisition.height + ipad_h;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
(*heights)[i] = child_requisition.height + ipad_h;
|
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
2010-08-13 03:22:07 +00:00
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
2001-07-06 02:10:32 +00:00
|
|
|
|
2010-06-02 04:28:22 +00:00
|
|
|
g_list_free (list);
|
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
for (i = 0; i < nchildren; i++)
|
|
|
|
{
|
|
|
|
if ((*widths)[i] == -1)
|
|
|
|
(*widths)[i] = needed_width;
|
|
|
|
if ((*heights)[i] == -1)
|
|
|
|
(*heights)[i] = needed_height;
|
|
|
|
}
|
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
if (nvis_children)
|
|
|
|
*nvis_children = nchildren;
|
2010-08-22 04:30:31 +00:00
|
|
|
|
2001-07-06 02:10:32 +00:00
|
|
|
if (nvis_secondaries)
|
|
|
|
*nvis_secondaries = nsecondaries;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
2005-03-20 07:01:23 +00:00
|
|
|
|
2009-06-02 12:01:19 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv;
|
2009-06-02 12:01:19 +00:00
|
|
|
GtkButtonBox *bbox;
|
|
|
|
gint nvis_children;
|
2010-08-22 04:30:31 +00:00
|
|
|
gint max_size;
|
|
|
|
gint total_size;
|
2009-06-02 12:01:19 +00:00
|
|
|
gint spacing;
|
2010-06-02 04:28:22 +00:00
|
|
|
guint border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
GtkOrientation orientation;
|
2010-08-22 04:30:31 +00:00
|
|
|
gint *widths;
|
|
|
|
gint *heights;
|
|
|
|
gint i;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
bbox = GTK_BUTTON_BOX (widget);
|
2010-05-24 19:35:01 +00:00
|
|
|
priv = bbox->priv;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
|
2010-08-22 04:30:31 +00:00
|
|
|
spacing = gtk_box_get_spacing (GTK_BOX (widget));
|
2009-06-02 12:01:19 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
gtk_button_box_child_requisition (widget,
|
|
|
|
&nvis_children,
|
|
|
|
NULL,
|
|
|
|
&widths, &heights);
|
|
|
|
|
|
|
|
max_size = 0;
|
|
|
|
total_size = 0;
|
|
|
|
for (i = 0; i < nvis_children; i++)
|
|
|
|
{
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
total_size += widths[i];
|
|
|
|
max_size = MAX (max_size, heights[i]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
total_size += heights[i];
|
|
|
|
max_size = MAX (max_size, widths[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_free (widths);
|
|
|
|
g_free (heights);
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
if (nvis_children == 0)
|
|
|
|
{
|
|
|
|
requisition->width = 0;
|
|
|
|
requisition->height = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-13 03:22:07 +00:00
|
|
|
switch (priv->layout_style)
|
2009-06-02 12:01:19 +00:00
|
|
|
{
|
|
|
|
case GTK_BUTTONBOX_SPREAD:
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->width = total_size + ((nvis_children + 1)*spacing);
|
2009-06-02 12:01:19 +00:00
|
|
|
else
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->height = total_size + ((nvis_children + 1)*spacing);
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
case GTK_BUTTONBOX_EDGE:
|
|
|
|
case GTK_BUTTONBOX_START:
|
|
|
|
case GTK_BUTTONBOX_END:
|
|
|
|
case GTK_BUTTONBOX_CENTER:
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->width = total_size + ((nvis_children - 1)*spacing);
|
2009-06-02 12:01:19 +00:00
|
|
|
else
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->height = total_size + ((nvis_children - 1)*spacing);
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-06-25 11:30:15 +00:00
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->height = max_size;
|
2009-06-25 11:30:15 +00:00
|
|
|
else
|
2010-08-22 04:30:31 +00:00
|
|
|
requisition->width = max_size;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
2010-06-02 04:28:22 +00:00
|
|
|
requisition->width += border_width * 2;
|
|
|
|
requisition->height += border_width * 2;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
2010-10-27 00:57:40 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_get_preferred_width (GtkWidget *widget,
|
|
|
|
gint *minimum,
|
|
|
|
gint *natural)
|
|
|
|
{
|
|
|
|
GtkRequisition requisition;
|
|
|
|
|
|
|
|
gtk_button_box_size_request (widget, &requisition);
|
|
|
|
|
|
|
|
*minimum = *natural = requisition.width;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_button_box_get_preferred_height (GtkWidget *widget,
|
|
|
|
gint *minimum,
|
|
|
|
gint *natural)
|
|
|
|
{
|
|
|
|
GtkRequisition requisition;
|
|
|
|
|
|
|
|
gtk_button_box_size_request (widget, &requisition);
|
|
|
|
|
|
|
|
*minimum = *natural = requisition.height;
|
|
|
|
}
|
|
|
|
|
2009-06-02 12:01:19 +00:00
|
|
|
static void
|
|
|
|
gtk_button_box_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkButtonBoxPrivate *priv;
|
2010-08-22 04:30:31 +00:00
|
|
|
GtkButtonBox *bbox;
|
2010-06-02 04:28:22 +00:00
|
|
|
GList *children, *list;
|
2009-06-02 12:01:19 +00:00
|
|
|
GtkAllocation child_allocation;
|
|
|
|
gint nvis_children;
|
2010-08-22 04:30:31 +00:00
|
|
|
gint n_primaries;
|
2009-06-02 12:01:19 +00:00
|
|
|
gint n_secondaries;
|
|
|
|
gint x = 0;
|
|
|
|
gint y = 0;
|
|
|
|
gint secondary_x = 0;
|
|
|
|
gint secondary_y = 0;
|
2009-06-25 11:30:15 +00:00
|
|
|
gint width = 0;
|
|
|
|
gint height = 0;
|
2009-06-02 12:01:19 +00:00
|
|
|
gint childspacing = 0;
|
|
|
|
gint spacing;
|
2010-06-02 04:28:22 +00:00
|
|
|
guint border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
GtkOrientation orientation;
|
2010-08-22 04:30:31 +00:00
|
|
|
gint ipad_x, ipad_y;
|
|
|
|
gint *widths;
|
|
|
|
gint *heights;
|
|
|
|
gint *sizes;
|
|
|
|
gint primary_size;
|
|
|
|
gint secondary_size;
|
|
|
|
gint total_size;
|
|
|
|
gint i;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
bbox = GTK_BUTTON_BOX (widget);
|
|
|
|
priv = bbox->priv;
|
2010-05-24 19:35:01 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
2010-05-24 19:35:01 +00:00
|
|
|
orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
|
2010-08-22 04:30:31 +00:00
|
|
|
spacing = gtk_box_get_spacing (GTK_BOX (widget));
|
2010-08-11 21:18:18 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
gtk_widget_style_get (widget,
|
|
|
|
"child-internal-pad-x", &ipad_x,
|
|
|
|
"child-internal-pad-y", &ipad_y,
|
|
|
|
NULL);
|
|
|
|
gtk_button_box_child_requisition (widget,
|
|
|
|
&nvis_children,
|
|
|
|
&n_secondaries,
|
|
|
|
&widths, &heights);
|
|
|
|
|
|
|
|
n_primaries = nvis_children - n_secondaries;
|
|
|
|
primary_size = 0;
|
|
|
|
secondary_size = 0;
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
sizes = widths;
|
|
|
|
else
|
|
|
|
sizes = heights;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
list = children = _gtk_box_get_children (GTK_BOX (widget));
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
GtkWidget *child;
|
|
|
|
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (gtk_widget_get_visible (child))
|
|
|
|
{
|
|
|
|
if (gtk_button_box_get_child_secondary (bbox, child))
|
|
|
|
secondary_size += sizes[i];
|
|
|
|
else
|
|
|
|
primary_size += sizes[i];
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total_size = primary_size + secondary_size;
|
|
|
|
|
2010-08-11 21:18:18 +00:00
|
|
|
gtk_widget_set_allocation (widget, allocation);
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2010-06-02 04:28:22 +00:00
|
|
|
width = allocation->width - border_width*2;
|
2009-06-02 12:01:19 +00:00
|
|
|
else
|
2010-06-02 04:28:22 +00:00
|
|
|
height = allocation->height - border_width*2;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
2010-08-13 03:22:07 +00:00
|
|
|
switch (priv->layout_style)
|
2009-06-02 12:01:19 +00:00
|
|
|
{
|
|
|
|
case GTK_BUTTONBOX_SPREAD:
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
childspacing = (width - total_size) / (nvis_children + 1);
|
2010-06-02 04:28:22 +00:00
|
|
|
x = allocation->x + border_width + childspacing;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_x = x + primary_size + n_primaries * childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
childspacing = (height - total_size) / (nvis_children + 1);
|
2010-06-02 04:28:22 +00:00
|
|
|
y = allocation->y + border_width + childspacing;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_y = y + primary_size + n_primaries * childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GTK_BUTTONBOX_EDGE:
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
if (nvis_children >= 2)
|
2009-06-25 11:30:15 +00:00
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
childspacing = (width - total_size) / (nvis_children - 1);
|
2010-06-02 04:28:22 +00:00
|
|
|
x = allocation->x + border_width;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_x = x + primary_size + n_primaries * childspacing;
|
2009-06-25 11:30:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* one or zero children, just center */
|
|
|
|
childspacing = width;
|
|
|
|
x = secondary_x = allocation->x
|
2010-08-22 04:30:31 +00:00
|
|
|
+ (allocation->width - widths[0]) / 2;
|
2009-06-25 11:30:15 +00:00
|
|
|
}
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (nvis_children >= 2)
|
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
childspacing = (height - total_size) / (nvis_children - 1);
|
2010-06-02 04:28:22 +00:00
|
|
|
y = allocation->y + border_width;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_y = y + primary_size + n_primaries * childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* one or zero children, just center */
|
|
|
|
childspacing = height;
|
|
|
|
y = secondary_y = allocation->y
|
2010-08-22 04:30:31 +00:00
|
|
|
+ (allocation->height - heights[0]) / 2;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GTK_BUTTONBOX_START:
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
2010-06-02 04:28:22 +00:00
|
|
|
x = allocation->x + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
secondary_x = allocation->x + allocation->width
|
2010-08-22 04:30:31 +00:00
|
|
|
- secondary_size - spacing * (n_secondaries - 1) - border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
2010-06-02 04:28:22 +00:00
|
|
|
y = allocation->y + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
secondary_y = allocation->y + allocation->height
|
2010-08-22 04:30:31 +00:00
|
|
|
- secondary_size - spacing * (n_secondaries - 1) - border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GTK_BUTTONBOX_END:
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
|
|
|
x = allocation->x + allocation->width
|
2010-08-22 04:30:31 +00:00
|
|
|
- primary_size - spacing * (n_primaries - 1) - border_width;
|
2010-06-02 04:28:22 +00:00
|
|
|
secondary_x = allocation->x + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
|
|
|
y = allocation->y + allocation->height
|
2010-08-22 04:30:31 +00:00
|
|
|
- primary_size - spacing * (n_primaries - 1) - border_width;
|
2010-06-02 04:28:22 +00:00
|
|
|
secondary_y = allocation->y + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GTK_BUTTONBOX_CENTER:
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
|
|
|
x = allocation->x +
|
|
|
|
(allocation->width
|
2010-08-22 04:30:31 +00:00
|
|
|
- (primary_size + spacing * (n_primaries - 1))) / 2
|
|
|
|
+ (secondary_size + n_secondaries * spacing) / 2;
|
2010-06-02 04:28:22 +00:00
|
|
|
secondary_x = allocation->x + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
childspacing = spacing;
|
|
|
|
y = allocation->y +
|
|
|
|
(allocation->height
|
2010-08-22 04:30:31 +00:00
|
|
|
- (primary_size + spacing * (n_primaries - 1))) / 2
|
|
|
|
+ (secondary_size + n_secondaries * spacing) / 2;
|
2010-06-02 04:28:22 +00:00
|
|
|
secondary_y = allocation->y + border_width;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2009-06-25 11:30:15 +00:00
|
|
|
g_assert_not_reached ();
|
2009-06-02 12:01:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
children = list;
|
|
|
|
i = 0;
|
2009-06-02 12:01:19 +00:00
|
|
|
while (children)
|
|
|
|
{
|
2010-07-14 20:23:14 +00:00
|
|
|
GtkWidget *child;
|
|
|
|
|
2009-06-02 12:01:19 +00:00
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
if (gtk_widget_get_visible (child))
|
2009-06-02 12:01:19 +00:00
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
child_allocation.width = widths[i];
|
|
|
|
child_allocation.height = heights[i];
|
2009-06-02 12:01:19 +00:00
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
child_allocation.y = allocation->y + (allocation->height - child_allocation.height) / 2;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
if (gtk_button_box_get_child_secondary (bbox, child))
|
2009-06-02 12:01:19 +00:00
|
|
|
{
|
|
|
|
child_allocation.x = secondary_x;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_x += child_allocation.width + childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_allocation.x = x;
|
2010-08-22 04:30:31 +00:00
|
|
|
x += child_allocation.width + childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
|
|
|
|
child_allocation.x = (allocation->x + allocation->width)
|
2010-08-22 04:30:31 +00:00
|
|
|
- (child_allocation.x + child_allocation.width - allocation->x);
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-22 04:30:31 +00:00
|
|
|
child_allocation.x = allocation->x + (allocation->width - child_allocation.width) / 2;
|
2009-06-02 12:01:19 +00:00
|
|
|
|
2010-08-22 04:30:31 +00:00
|
|
|
if (gtk_button_box_get_child_secondary (bbox, child))
|
2009-06-02 12:01:19 +00:00
|
|
|
{
|
|
|
|
child_allocation.y = secondary_y;
|
2010-08-22 04:30:31 +00:00
|
|
|
secondary_y += child_allocation.height + childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_allocation.y = y;
|
2010-08-22 04:30:31 +00:00
|
|
|
y += child_allocation.height + childspacing;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-14 20:23:14 +00:00
|
|
|
gtk_widget_size_allocate (child, &child_allocation);
|
2010-08-22 04:30:31 +00:00
|
|
|
i++;
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
}
|
2010-06-02 04:28:22 +00:00
|
|
|
|
|
|
|
g_list_free (list);
|
2010-08-22 04:30:31 +00:00
|
|
|
g_free (widths);
|
|
|
|
g_free (heights);
|
2009-06-02 12:01:19 +00:00
|
|
|
}
|
|
|
|
|
2010-05-25 22:55:15 +00:00
|
|
|
/**
|
|
|
|
* gtk_button_box_new:
|
|
|
|
* @orientation: the box' orientation.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkButtonBox.
|
|
|
|
*
|
|
|
|
* Return value: a new #GtkButtonBox.
|
|
|
|
*
|
|
|
|
* Since: 3.0
|
|
|
|
*/
|
|
|
|
GtkWidget *
|
|
|
|
gtk_button_box_new (GtkOrientation orientation)
|
|
|
|
{
|
|
|
|
return g_object_new (GTK_TYPE_BUTTON_BOX,
|
|
|
|
"orientation", orientation,
|
|
|
|
NULL);
|
|
|
|
}
|