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

new utility function which sets a button box' style according to a 

2003-11-12  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpeditor.[ch] (gimp_editor_set_box_style): new
	utility function which sets a button box' style according to a
	GimpEditor's style properties.

	* app/widgets/gimpcoloreditor.c (gimp_color_editor_style_set)
	* app/widgets/gimpeditor.c (gimp_editor_style_set): use it.
This commit is contained in:
Michael Natterer 2003-11-12 00:21:58 +00:00 committed by Michael Natterer
parent 41769a4cea
commit 05acb4a862
4 changed files with 65 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-11-12 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpeditor.[ch] (gimp_editor_set_box_style): new
utility function which sets a button box' style according to a
GimpEditor's style properties.
* app/widgets/gimpcoloreditor.c (gimp_color_editor_style_set)
* app/widgets/gimpeditor.c (gimp_editor_style_set): use it.
2003-11-12 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcoloreditor.c: implement GtkWidget::style_set()

35
app/widgets/gimpcoloreditor.c
View File

@ -410,44 +410,13 @@ static void
gimp_color_editor_style_set (GtkWidget *widget,
GtkStyle *prev_style)
{
GimpColorEditor *editor;
GtkIconSize button_icon_size;
gint button_spacing;
GimpColorEditor *editor = GIMP_COLOR_EDITOR (widget);
if (GTK_WIDGET_CLASS (parent_class)->style_set)
GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
editor = GIMP_COLOR_EDITOR (widget);
gtk_widget_style_get (widget,
"button_icon_size", &button_icon_size,
"button_spacing", &button_spacing,
NULL);
if (editor->hbox)
{
GList *children;
GList *list;
gtk_box_set_spacing (GTK_BOX (editor->hbox), button_spacing);
children = gtk_container_get_children (GTK_CONTAINER (editor->hbox));
for (list = children; list; list = g_list_next (list))
{
GtkBin *bin;
gchar *stock_id;
bin = GTK_BIN (list->data);
gtk_image_get_stock (GTK_IMAGE (bin->child), &stock_id, NULL);
gtk_image_set_from_stock (GTK_IMAGE (bin->child),
stock_id,
button_icon_size);
}
g_list_free (children);
}
gimp_editor_set_box_style (GIMP_EDITOR (editor), GTK_BOX (editor->hbox));
}
void

86
app/widgets/gimpeditor.c
View File

@ -167,48 +167,18 @@ static void
gimp_editor_style_set (GtkWidget *widget,
GtkStyle *prev_style)
{
GimpEditor *editor;
GtkIconSize button_icon_size;
gint button_spacing;
GimpEditor *editor = GIMP_EDITOR (widget);
gint content_spacing;
editor = GIMP_EDITOR (widget);
if (GTK_WIDGET_CLASS (parent_class)->style_set)
GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
gtk_widget_style_get (widget,
"button_icon_size", &button_icon_size,
"button_spacing", &button_spacing,
"content_spacing", &content_spacing,
NULL);
gtk_widget_style_get (widget, "content_spacing", &content_spacing, NULL);
gtk_box_set_spacing (GTK_BOX (widget), content_spacing);
if (editor->button_box)
{
GList *children;
GList *list;
gtk_box_set_spacing (GTK_BOX (editor->button_box), button_spacing);
children = gtk_container_get_children (GTK_CONTAINER (editor->button_box));
for (list = children; list; list = g_list_next (list))
{
GtkBin *bin;
gchar *stock_id;
bin = GTK_BIN (list->data);
gtk_image_get_stock (GTK_IMAGE (bin->child), &stock_id, NULL);
gtk_image_set_from_stock (GTK_IMAGE (bin->child),
stock_id,
button_icon_size);
}
g_list_free (children);
}
if (GTK_WIDGET_CLASS (parent_class)->style_set)
GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
gimp_editor_set_box_style (editor, GTK_BOX (editor->button_box));
}
static GimpItemFactory *
@ -340,6 +310,52 @@ gimp_editor_add_stock_box (GimpEditor *editor,
return first_button;
}
void
gimp_editor_set_box_style (GimpEditor *editor,
GtkBox *box)
{
GtkIconSize button_icon_size;
gint button_spacing;
GList *children;
GList *list;
g_return_if_fail (GIMP_IS_EDITOR (editor));
g_return_if_fail (GTK_IS_BOX (box));
gtk_widget_style_get (GTK_WIDGET (editor),
"button_icon_size", &button_icon_size,
"button_spacing", &button_spacing,
NULL);
gtk_box_set_spacing (box, button_spacing);
children = gtk_container_get_children (GTK_CONTAINER (box));
for (list = children; list; list = g_list_next (list))
{
if (GTK_IS_BUTTON (list->data))
{
GtkWidget *child;
child = gtk_bin_get_child (GTK_BIN (list->data));
if (GTK_IS_IMAGE (child))
{
gchar *stock_id;
gtk_image_get_stock (GTK_IMAGE (child), &stock_id, NULL);
gtk_image_set_from_stock (GTK_IMAGE (child),
stock_id, button_icon_size);
}
}
}
g_list_free (children);
}
/* private functions */
static GtkIconSize
gimp_editor_ensure_button_box (GimpEditor *editor)
{

3
app/widgets/gimpeditor.h
View File

@ -75,5 +75,8 @@ GtkWidget * gimp_editor_add_stock_box (GimpEditor *editor,
GCallback callback,
gpointer callback_data);
void gimp_editor_set_box_style (GimpEditor *editor,
GtkBox *box);
#endif /* __GIMP_EDITOR_H__ */