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

app: add gimp_edit_fill_full() which takes color and pattern 

and use it for dropping colors and patterns on the display
and on the layers dialog, instead of using the overkill
gimp_drawable_bucket_fill_full().
This commit is contained in:
Michael Natterer 2012-03-18 22:31:11 +01:00
parent 9d333190d6
commit ffeb3515db
4 changed files with 49 additions and 58 deletions

18
app/core/gimp-edit.c
View File

@ -453,6 +453,24 @@ gimp_edit_fill (GimpImage *image,
undo_desc);
}
gboolean
gimp_edit_fill_full (GimpImage *image,
GimpDrawable *drawable,
const GimpRGB *color,
GimpPattern *pattern,
const gchar *undo_desc)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
g_return_val_if_fail (color != NULL || pattern != NULL, FALSE);
return gimp_edit_fill_internal (image, drawable,
color, pattern,
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE,
undo_desc);
}
gboolean
gimp_edit_fade (GimpImage *image,
GimpContext *context)

5
app/core/gimp-edit.h
View File

@ -61,6 +61,11 @@ gboolean gimp_edit_fill (GimpImage *image,
GimpDrawable *drawable,
GimpContext *context,
GimpFillType fill_type);
gboolean gimp_edit_fill_full (GimpImage *image,
GimpDrawable *drawable,
const GimpRGB *color,
GimpPattern *pattern,
const gchar *undo_desc);
gboolean gimp_edit_fade (GimpImage *image,
GimpContext *context);

15
app/display/gimpdisplayshell-dnd.c
View File

@ -31,7 +31,6 @@
#include "core/gimpbuffer.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpdrawable-bucket-fill.h"
#include "core/gimpimage.h"
#include "core/gimpimage-merge.h"
#include "core/gimpimage-new.h"
@ -367,15 +366,11 @@ gimp_display_shell_dnd_bucket_fill (GimpDisplayShell *shell,
}
else
{
gimp_drawable_bucket_fill_full (drawable,
fill_mode,
GIMP_NORMAL_MODE, GIMP_OPACITY_OPAQUE,
FALSE, /* no seed fill */
FALSE, /* don't fill transp */
GIMP_SELECT_CRITERION_COMPOSITE,
0.0, FALSE, /* fill params */
0.0, 0.0, /* ignored */
color, pattern);
gimp_edit_fill_full (image, drawable,
color, pattern,
pattern ?
C_("undo-type", "Drop pattern to layer") :
C_("undo-type", "Drop color to layer"));
}
gimp_display_shell_dnd_flush (shell, image);

69
app/widgets/gimpdrawabletreeview.c
View File

@ -28,13 +28,12 @@
#include "widgets-types.h"
#include "core/gimp.h"
#include "core/gimp-edit.h"
#include "core/gimpcontext.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-bucket-fill.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
#include "core/gimppattern.h"
#include "core/gimptoolinfo.h"
#include "gimpcontainerview.h"
#include "gimpdnd.h"
@ -235,16 +234,12 @@ gimp_drawable_tree_view_drop_viewable (GimpContainerTreeView *view,
{
if (dest_viewable && GIMP_IS_PATTERN (src_viewable))
{
gimp_drawable_bucket_fill_full (GIMP_DRAWABLE (dest_viewable),
GIMP_PATTERN_BUCKET_FILL,
GIMP_NORMAL_MODE, GIMP_OPACITY_OPAQUE,
FALSE, /* no seed fill */
FALSE, /* don't fill transp */
GIMP_SELECT_CRITERION_COMPOSITE,
0.0, FALSE, /* fill params */
0.0, 0.0, /* ignored */
NULL, GIMP_PATTERN (src_viewable));
gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
gimp_edit_fill_full (gimp_item_get_image (GIMP_ITEM (dest_viewable)),
GIMP_DRAWABLE (dest_viewable),
NULL, GIMP_PATTERN (src_viewable),
C_("undo-type", "Drop pattern to layer"));
gimp_image_flush (gimp_item_get_image (GIMP_ITEM (dest_viewable)));
return;
}
@ -262,16 +257,12 @@ gimp_drawable_tree_view_drop_color (GimpContainerTreeView *view,
{
if (dest_viewable)
{
gimp_drawable_bucket_fill_full (GIMP_DRAWABLE (dest_viewable),
GIMP_FG_BUCKET_FILL,
GIMP_NORMAL_MODE, GIMP_OPACITY_OPAQUE,
FALSE, /* no seed fill */
FALSE, /* don't fill transp */
GIMP_SELECT_CRITERION_COMPOSITE,
0.0, FALSE, /* fill params */
0.0, 0.0, /* ignored */
color, NULL);
gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
gimp_edit_fill_full (gimp_item_get_image (GIMP_ITEM (dest_viewable)),
GIMP_DRAWABLE (dest_viewable),
color, NULL,
C_("undo-type", "Drop color to layer"));
gimp_image_flush (gimp_item_get_image (GIMP_ITEM (dest_viewable)));
}
}
@ -316,7 +307,6 @@ static void
gimp_drawable_tree_view_new_dropped (GimpItemTreeView *view,
gint x,
gint y,
GimpBucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern)
{
@ -329,25 +319,12 @@ gimp_drawable_tree_view_new_dropped (GimpItemTreeView *view,
if (item)
{
/* Get the bucket fill context */
GimpContext *context;
GimpToolInfo *tool_info = gimp_get_tool_info (gimp_item_tree_view_get_image (view)->gimp,
"gimp-bucket-fill-tool");
if (tool_info && tool_info->tool_options)
context = GIMP_CONTEXT (tool_info->tool_options);
else
context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view));
gimp_drawable_bucket_fill_full (GIMP_DRAWABLE (item),
fill_mode,
gimp_context_get_paint_mode (context),
gimp_context_get_opacity (context),
FALSE, /* no seed fill */
FALSE, /* don't fill transp */
GIMP_SELECT_CRITERION_COMPOSITE,
0.0, FALSE, 0.0, 0.0 /* fill params */,
color, pattern);
gimp_edit_fill_full (gimp_item_get_image (item),
GIMP_DRAWABLE (item),
color, pattern,
pattern ?
C_("undo-type", "Drop pattern to layer") :
C_("undo-type", "Drop color to layer"));
}
gimp_image_undo_group_end (gimp_item_tree_view_get_image (view));
@ -363,9 +340,7 @@ gimp_drawable_tree_view_new_pattern_dropped (GtkWidget *widget,
gpointer data)
{
gimp_drawable_tree_view_new_dropped (GIMP_ITEM_TREE_VIEW (data), x, y,
GIMP_PATTERN_BUCKET_FILL,
NULL,
GIMP_PATTERN (viewable));
NULL, GIMP_PATTERN (viewable));
}
static void
@ -376,7 +351,5 @@ gimp_drawable_tree_view_new_color_dropped (GtkWidget *widget,
gpointer data)
{
gimp_drawable_tree_view_new_dropped (GIMP_ITEM_TREE_VIEW (data), x, y,
GIMP_FG_BUCKET_FILL,
color,
NULL);
color, NULL);
}