HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure GDK_MOD2_MASK is cleared when getting modifiers

Browse Source 
gtk_accelerator_get_default_mod_mask() behaves differently on OS X under
GTK 3 when compared to GTK 2. On GTK 2 it used to clear the GDK_MOD2_MASK
bit while on GTK 3 it's preserved. We need to clear it ourselves
otherwise e.g. <Command>S leads to <Commands><Mod2>S and none of the
keybindings work under GTK 3.
This commit is contained in:
Jiří Techet 2017-10-12 19:27:56 +02:00
parent fda8b97ea6
commit 83e8ae1737
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/keybindings.c
View File

@ -124,7 +124,10 @@ GdkModifierType keybindings_get_modifiers(GdkModifierType mods)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
if (mods & GDK_MOD2_MASK) if (mods & GDK_MOD2_MASK)
{
mods |= GEANY_PRIMARY_MOD_MASK; mods |= GEANY_PRIMARY_MOD_MASK;
mods &= ~GDK_MOD2_MASK;
}
#endif #endif
return mods & gtk_accelerator_get_default_mod_mask(); return mods & gtk_accelerator_get_default_mod_mask();
} }