dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

factored button_box creation out to a utility function. 

2003-04-01  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpeditor.c: factored button_box creation out to a
	utility function.
This commit is contained in:
Michael Natterer 2003-04-01 09:07:53 +00:00 committed by Michael Natterer
parent 35c1e88f43
commit 7362b07f8f
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-01 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpeditor.c: factored button_box creation out to a
utility function.
2003-04-01 Manish Singh <yosh@gimp.org> 2003-04-01 Manish Singh <yosh@gimp.org>
* config/gimpguiconfig.[ch]: added gboolean can_change_accels * config/gimpguiconfig.[ch]: added gboolean can_change_accels

58
app/widgets/gimpeditor.c
View File

@ -44,6 +44,7 @@ static void gimp_editor_init (GimpEditor *panel);
static void gimp_editor_destroy (GtkObject *object); static void gimp_editor_destroy (GtkObject *object);
static void gimp_editor_style_set (GtkWidget *widget, static void gimp_editor_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
static GtkIconSize gimp_editor_ensure_button_box (GimpEditor *editor);
static GtkVBoxClass *parent_class = NULL; static GtkVBoxClass *parent_class = NULL;
@ -145,23 +146,22 @@ gimp_editor_style_set (GtkWidget *widget,
GtkStyle *prev_style) GtkStyle *prev_style)
{ {
GimpEditor *editor; GimpEditor *editor;
gint content_spacing;
gint button_spacing;
GtkIconSize button_icon_size; GtkIconSize button_icon_size;
gint button_spacing;
gint content_spacing;
editor = GIMP_EDITOR (widget); editor = GIMP_EDITOR (widget);
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"content_spacing", &content_spacing,
"button_spacing", &button_spacing,
"button_icon_size", &button_icon_size, "button_icon_size", &button_icon_size,
"button_spacing", &button_spacing,
"content_spacing", &content_spacing,
NULL); NULL);
gtk_box_set_spacing (GTK_BOX (widget), content_spacing); gtk_box_set_spacing (GTK_BOX (widget), content_spacing);
if (editor->button_box) if (editor->button_box)
{ {
GtkBin *bin;
GList *children; GList *children;
GList *list; GList *list;
@ -171,6 +171,7 @@ gimp_editor_style_set (GtkWidget *widget,
for (list = children; list; list = g_list_next (list)) for (list = children; list; list = g_list_next (list))
{ {
GtkBin *bin;
gchar *stock_id; gchar *stock_id;
bin = GTK_BIN (list->data); bin = GTK_BIN (list->data);
@ -230,23 +231,12 @@ gimp_editor_add_button (GimpEditor *editor,
{ {
GtkWidget *button; GtkWidget *button;
GtkWidget *image; GtkWidget *image;
gint button_spacing;
GtkIconSize button_icon_size; GtkIconSize button_icon_size;
g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL); g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
g_return_val_if_fail (stock_id != NULL, NULL); g_return_val_if_fail (stock_id != NULL, NULL);
gtk_widget_style_get (GTK_WIDGET (editor), button_icon_size = gimp_editor_ensure_button_box (editor);
"button_spacing", &button_spacing,
"button_icon_size", &button_icon_size,
NULL);
if (! editor->button_box)
{
editor->button_box = gtk_hbox_new (TRUE, button_spacing);
gtk_box_pack_end (GTK_BOX (editor), editor->button_box, FALSE, FALSE, 0);
gtk_widget_show (editor->button_box);
}
button = gimp_button_new (); button = gimp_button_new ();
gtk_box_pack_start (GTK_BOX (editor->button_box), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (editor->button_box), button, TRUE, TRUE, 0);
@ -281,7 +271,6 @@ gimp_editor_add_stock_box (GimpEditor *editor,
{ {
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *first_button; GtkWidget *first_button;
gint button_spacing;
GtkIconSize button_icon_size; GtkIconSize button_icon_size;
GList *children; GList *children;
GList *list; GList *list;
@ -290,17 +279,7 @@ gimp_editor_add_stock_box (GimpEditor *editor,
g_return_val_if_fail (g_type_is_a (enum_type, G_TYPE_ENUM), NULL); g_return_val_if_fail (g_type_is_a (enum_type, G_TYPE_ENUM), NULL);
g_return_val_if_fail (stock_prefix != NULL, NULL); g_return_val_if_fail (stock_prefix != NULL, NULL);
gtk_widget_style_get (GTK_WIDGET (editor), button_icon_size = gimp_editor_ensure_button_box (editor);
"button_spacing", &button_spacing,
"button_icon_size", &button_icon_size,
NULL);
if (! editor->button_box)
{
editor->button_box = gtk_hbox_new (TRUE, button_spacing);
gtk_box_pack_end (GTK_BOX (editor), editor->button_box, FALSE, FALSE, 0);
gtk_widget_show (editor->button_box);
}
hbox = gimp_enum_stock_box_new (enum_type, stock_prefix, button_icon_size, hbox = gimp_enum_stock_box_new (enum_type, stock_prefix, button_icon_size,
callback, callback_data, callback, callback_data,
@ -326,3 +305,24 @@ gimp_editor_add_stock_box (GimpEditor *editor,
return first_button; return first_button;
} }
static GtkIconSize
gimp_editor_ensure_button_box (GimpEditor *editor)
{
GtkIconSize button_icon_size;
gint button_spacing;
gtk_widget_style_get (GTK_WIDGET (editor),
"button_icon_size", &button_icon_size,
"button_spacing", &button_spacing,
NULL);
if (! editor->button_box)
{
editor->button_box = gtk_hbox_new (TRUE, button_spacing);
gtk_box_pack_end (GTK_BOX (editor), editor->button_box, FALSE, FALSE, 0);
gtk_widget_show (editor->button_box);
}
return button_icon_size;
}