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

app: pull virtual modifier replacement into gimp_get_mod_string() 

and remove it from all other places. We only want to have the virtual
modifiers when displaying a modifier string (and in some other cases,
but these are all handled internally by GTK+).
This commit is contained in:
Michael Natterer 2011-10-06 22:26:43 +02:00
parent 9fff65f1b2
commit 6d1b5c4241
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/actions/layers-actions.c
View File

@ -432,8 +432,6 @@ layers_actions_fix_tooltip (GimpActionGroup *group,
const gchar *old_hint;
gchar *new_hint;
modifiers = gimp_replace_virtual_modifiers (modifiers);
old_hint = gimp_action_group_get_action_tooltip (group,
action);
new_hint = g_strconcat (old_hint,

2
app/tools/gimpselectionoptions.c
View File

@ -190,7 +190,7 @@ gimp_selection_options_get_modifiers (GimpChannelOps operation)
break;
}
return gimp_get_mod_string (gimp_replace_virtual_modifiers (modifiers));
return gimp_get_mod_string (modifiers);
}
GtkWidget *

2
app/widgets/gimpeditor.c
View File

@ -684,7 +684,7 @@ gimp_editor_add_action_button (GimpEditor *editor,
{
ExtendedAction *ext = g_slice_new (ExtendedAction);
ext->mod_mask = gimp_replace_virtual_modifiers (mod_mask);
ext->mod_mask = mod_mask;
ext->action = action;
extended = g_list_prepend (extended, ext);

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

@ -484,6 +484,8 @@ gimp_get_mod_string (GdkModifierType modifiers)
if (G_UNLIKELY (! mod_labels))
mod_labels = g_hash_table_new (g_int_hash, g_int_equal);
modifiers = gimp_replace_virtual_modifiers (modifiers);
label = g_hash_table_lookup (mod_labels, &modifiers);
if (! label)