diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-06-30 15:46:07 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-06-30 15:46:07 +0000 |
| commit | 1fb52a2072857602eb9777d38ee6aee556d27b4c (patch) | |
| tree | f7722dc7f42e3f8181d7bb1a326753f8da6a8300 /src/shortcuts.cpp | |
| parent | Starting selectable knots (diff) | |
| parent | Merge branch 'master' of gitlab.com:inkscape/inkscape (diff) | |
| download | inkscape-1fb52a2072857602eb9777d38ee6aee556d27b4c.tar.gz inkscape-1fb52a2072857602eb9777d38ee6aee556d27b4c.zip | |
Merge branch 'master' of https://gitlab.com/jabiertxof/inkscape into selectable-knots
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 0cb0285f8..8a8d36d5a 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -625,6 +625,12 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) { modifiers |= SP_SHORTCUT_HYPER_MASK; } else if (!strcmp(mod, "Meta")) { modifiers |= SP_SHORTCUT_META_MASK; + } else if (!strcmp(mod, "Primary")) { +#ifdef __APPLE__ + modifiers |= SP_SHORTCUT_META_MASK; +#else + modifiers |= SP_SHORTCUT_CONTROL_MASK; +#endif } else { g_warning("Unknown modifier %s for %s", mod, verb_name); } |