callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove widget parameter from gimp_modifiers_to_channel_op()

Browse Source 
and simply use the default keymap.
This commit is contained in:
Michael Natterer
2011-10-06 10:24:49 +02:00
parent 10a9c660f8
commit c0610697cb
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/widgets/gimpitemtreeview.c
View File

@ -1417,9 +1417,7 @@ gimp_item_tree_view_item_pre_clicked (GimpCellRendererViewable *cell,
if (renderer)
{
GimpItem *item = GIMP_ITEM (renderer->viewable);
GimpChannelOps op;
op = gimp_modifiers_to_channel_op (GTK_WIDGET (item_view), state);
GimpChannelOps op = gimp_modifiers_to_channel_op (state);
gimp_item_to_selection (item, op,
TRUE, FALSE, 0.0, 0.0);

2
app/widgets/gimpselectioneditor.c
View File

@ -270,7 +270,7 @@ gimp_selection_view_button_press (GtkWidget *widget,
if (! drawable)
return TRUE;
operation = gimp_modifiers_to_channel_op (widget, bevent->state);
operation = gimp_modifiers_to_channel_op (bevent->state);
x = gimp_image_get_width (image_editor->image) * bevent->x / renderer->width;
y = gimp_image_get_height (image_editor->image) * bevent->y / renderer->height;

16
app/widgets/gimpwidgets-utils.c
View File

@ -617,20 +617,10 @@ gimp_suggest_modifiers (const gchar *message,
#undef BUF_SIZE
GimpChannelOps
gimp_modifiers_to_channel_op (GtkWidget *widget,
GdkModifierType modifiers)
gimp_modifiers_to_channel_op (GdkModifierType modifiers)
{
GdkModifierType extend_mask;
GdkModifierType modify_mask;
g_return_val_if_fail (GTK_IS_WIDGET (widget), GIMP_CHANNEL_OP_REPLACE);
extend_mask =
gtk_widget_get_modifier_mask (widget,
GDK_MODIFIER_INTENT_EXTEND_SELECTION);
modify_mask =
gtk_widget_get_modifier_mask (widget,
GDK_MODIFIER_INTENT_MODIFY_SELECTION);
GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
GdkModifierType modify_mask = gimp_get_modify_selection_mask ();
if (modifiers & extend_mask)
{

3
app/widgets/gimpwidgets-utils.h
View File

@ -58,8 +58,7 @@ gchar * gimp_suggest_modifiers (const gchar *messag
const gchar *shift_format,
const gchar *control_format,
const gchar *alt_format);
GimpChannelOps gimp_modifiers_to_channel_op (GtkWidget *widget,
GdkModifierType modifiers);
GimpChannelOps gimp_modifiers_to_channel_op (GdkModifierType modifiers);
GdkModifierType gimp_replace_virtual_modifiers (GdkModifierType modifiers);
GdkModifierType gimp_get_extend_selection_mask (void);
GdkModifierType gimp_get_modify_selection_mask (void);