Merge branch 'macos-modifier-keys' into 'main'

gtktext/gtktextview: Use correct modifier keys for macOS shortcuts

See merge request GNOME/gtk!7837
This commit is contained in:
Matthias Clasen
2024-11-05 18:34:18 +00:00
3 changed files with 12 additions and 12 deletions

View File

@@ -2823,16 +2823,16 @@ gtk_label_class_init (GtkLabelClass *class)
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (widget_class, GDK_KEY_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_Up, GDK_META_MASK,

View File

@@ -1444,16 +1444,16 @@ gtk_text_class_init (GtkTextClass *class)
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (widget_class, GDK_KEY_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_Up, GDK_META_MASK,

View File

@@ -1794,16 +1794,16 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (widget_class, GDK_KEY_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Right, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_ALT_MASK,
add_move_binding (widget_class, GDK_KEY_KP_Left, GDK_META_MASK,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (widget_class, GDK_KEY_Up, GDK_META_MASK,