plug-ins/gfig/gfig-dialog.c let objects keep their own fill_style context.

* plug-ins/gfig/gfig-dialog.c
* plug-ins/gfig/gfig-style.c: let objects keep their own fill_style
  context.
This commit is contained in:
David Odin
2004-12-13 10:12:05 +00:00
parent 162c352f28
commit b73e628cab
3 changed files with 12 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2004-12-13 DindinX <dindinx@gimp.org>
* plug-ins/gfig/gfig-dialog.c
* plug-ins/gfig/gfig-style.c: let objects keep their own fill_style
context.
2004-12-13 Sven Neumann <sven@gimp.org>
* app/core/gimpimage-convert.c: applied patch from Adam D. Moss with

View File

@ -1860,9 +1860,6 @@ void
gfig_paint_callback (void)
{
GList *objs;
gint layer_count = 0;
gchar buf[128];
gint count;
gint ccount = 0;
GfigObject *object;
@ -1871,8 +1868,6 @@ gfig_paint_callback (void)
objs = gfig_context->current_obj->obj_list;
count = g_list_length (objs);
gimp_drawable_fill (gfig_context->drawable_id, GIMP_TRANSPARENT_FILL);
/* gimp_drawable_fill (gfig_context->drawable_id, GIMP_PATTERN_FILL); */
@ -1881,15 +1876,18 @@ gfig_paint_callback (void)
{
if (ccount == obj_show_single || obj_show_single == -1)
{
FillType saved_filltype;
object = objs->data;
sprintf (buf, _("Gfig layer %d"), layer_count++);
gfig_style_apply (&object->style);
saved_filltype = gfig_context_get_current_style ()->fill_type;
gfig_context_get_current_style ()->fill_type = object->style.fill_type;
object->class->paintfunc (object);
gfig_context_get_current_style ()->fill_type = saved_filltype;
gimp_selection_none (gfig_context->image_id);
}
objs = g_list_next (objs);

View File

@ -659,9 +659,9 @@ gfig_style_set_context_from_style (Style *style)
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (gfig_context->fillstyle_combo),
(gint) style->fill_type);
gfig_context->enable_repaint = enable_repaint;
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_context->paint_type_toggle),
style->paint_type);
gfig_context->enable_repaint = enable_repaint;
}
/*