Skip to content

Correct RTL accelerator arrow keys #2797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stan-janssen wants to merge 4 commits into
base: main
Choose a base branch
from
+110 −76
Open

Correct RTL accelerator arrow keys #2797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c78645f
Change the shortcut for Focus Sidebar to not interfere with text editing
May 19, 2026
ea9fa11
Merge branch 'main' into focus-sidebar-shortcut
jeremypw May 23, 2026
6c884e0
Add explicit shortcut for focusing on the current container
May 24, 2026
8be84dd
Correct accelerator arrow keys for RTL languages
May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/View/IconView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,21 @@ public class Files.IconView : Files.AbstractDirectoryView {

/* Override native Gtk.IconView cursor handling */
protected override bool move_cursor (uint keyval, bool only_shift_pressed, bool control_pressed) {
uint prev_key;
uint next_key;
if (Gtk.StateFlags.DIR_RTL in get_style_context ().get_state ()) {
prev_key = Gdk.Key.Right;
next_key = Gdk.Key.Left;
} else {
prev_key = Gdk.Key.Left;
next_key = Gdk.Key.Right;
}

Gtk.TreePath? path = get_path_at_cursor ();
if (path != null) {
if (keyval == Gdk.Key.Right) {
if (keyval == next_key) {
path.next (); /* Does not check if path is valid */
} else if (keyval == Gdk.Key.Left) {
} else if (keyval == prev_key) {
path.prev ();
} else if (keyval == Gdk.Key.Up) {
path = up (path);
Expand Down
51 changes: 28 additions & 23 deletions src/View/ListView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,36 +160,41 @@ namespace Files {
}

protected override bool on_view_key_press_event (uint keyval, uint keycode, Gdk.ModifierType state) {
uint up_key;
uint down_key;
if (Gtk.StateFlags.DIR_RTL in get_style_context ().get_state ()) {
up_key = Gdk.Key.Right;
down_key = Gdk.Key.Left;
} else {
up_key = Gdk.Key.Left;
down_key = Gdk.Key.Right;
}

bool control_pressed = ((state & Gdk.ModifierType.CONTROL_MASK) != 0);
bool shift_pressed = ((state & Gdk.ModifierType.SHIFT_MASK) != 0);
if (!control_pressed && !shift_pressed) {
switch (keyval) {
case Gdk.Key.Right:
Gtk.TreePath? path = null;
tree.get_cursor (out path, null);

if (path != null) {
tree.expand_row (path, false);
}

return true;
if (keyval == down_key) {
Gtk.TreePath? path = null;
tree.get_cursor (out path, null);

case Gdk.Key.Left:
Gtk.TreePath? path = null;
tree.get_cursor (out path, null);
if (path != null) {
tree.expand_row (path, false);
}

if (path != null) {
if (tree.is_row_expanded (path)) {
tree.collapse_row (path);
} else if (path.up ()) {
tree.collapse_row (path);
}
return true;
} else if (keyval == up_key) {
Gtk.TreePath? path = null;
tree.get_cursor (out path, null);

if (path != null) {
if (tree.is_row_expanded (path)) {
tree.collapse_row (path);
} else if (path.up ()) {
tree.collapse_row (path);
}
}

return true;

default:
break;
return true;
}
}

Expand Down
88 changes: 45 additions & 43 deletions src/View/Miller.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,59 +424,61 @@ namespace Files.View {

View.Slot? to_activate = null;
var prefs = Files.Preferences.get_default ();
switch (keyval) {
case Gdk.Key.Left:
if (current_position > 0) {
if (prefs.show_file_preview) {
clear_file_details ();
}

to_activate = slot_list.nth_data (current_position - 1);
}

break;

case Gdk.Key.Right:
if (current_slot.get_selected_files () == null) {
return true;
}
uint up_key;
uint down_key;

Files.File? selected_file = current_slot.get_selected_files ().data;
if (selected_file == null) {
return true;
}
// Determine which key is the "drill down" key based on the layout direction
if (Gtk.StateFlags.DIR_RTL in scrolled_window.get_style_context ().get_state ()) {
up_key = Gdk.Key.Right;
down_key = Gdk.Key.Left;
} else {
up_key = Gdk.Key.Left;
down_key = Gdk.Key.Right;
}

GLib.File current_location = selected_file.location;
GLib.File? next_location = null;
if (current_position < slot_list.length () - 1) { //Can be assumed to limited in length
next_location = slot_list.nth_data (current_position + 1).location;
if (keyval == up_key) {
if (current_position > 0) {
if (prefs.show_file_preview) {
clear_file_details ();
}

if (next_location != null && next_location.equal (current_location)) {
to_activate = slot_list.nth_data (current_position + 1);
} else if (selected_file.is_folder ()) {
add_location (current_location, current_slot);
return true;
}
to_activate = slot_list.nth_data (current_position - 1);
}

break;
} else if (keyval == down_key) {
if (current_slot.get_selected_files () == null) {
return true;
}

case Gdk.Key.BackSpace:
if (current_position > 0) {
truncate_list_after_slot (slot_list.nth_data (current_position - 1));
} else {
ctab.go_up ();
return true;
}
Files.File? selected_file = current_slot.get_selected_files ().data;
if (selected_file == null) {
return true;
}

if (prefs.show_file_preview) {
clear_file_details ();
}
GLib.File current_location = selected_file.location;
GLib.File? next_location = null;
if (current_position < slot_list.length () - 1) { //Can be assumed to limited in length
next_location = slot_list.nth_data (current_position + 1).location;
}

break;
if (next_location != null && next_location.equal (current_location)) {
to_activate = slot_list.nth_data (current_position + 1);
} else if (selected_file.is_folder ()) {
add_location (current_location, current_slot);
return true;
}
} else if (keyval == Gdk.Key.BackSpace) {
if (current_position > 0) {
truncate_list_after_slot (slot_list.nth_data (current_position - 1));
} else {
ctab.go_up ();
return true;
}

default:
break;
if (prefs.show_file_preview) {
clear_file_details ();
}
}

if (to_activate != null) {
Expand Down
33 changes: 25 additions & 8 deletions src/View/Window.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ public class Files.View.Window : Hdy.ApplicationWindow {
{"tabhistory-restore", action_tabhistory_restore, "s" },
{"forward", action_forward, "i"},
{"back", action_back, "i"},
{"focus-sidebar", action_focus_sidebar}
{"focus-sidebar", action_focus_sidebar},
{"focus-current-container", action_focus_current_container}
};

private static uint window_id = 0;
Expand Down Expand Up @@ -157,11 +158,19 @@ public class Files.View.Window : Hdy.ApplicationWindow {
marlin_app.set_accels_for_action ("win.go-to::NETWORK", {"<Alt>N"});
marlin_app.set_accels_for_action ("win.go-to::SERVER", {"<Alt>C"});
marlin_app.set_accels_for_action ("win.go-to::UP", {"<Alt>Up"});
marlin_app.set_accels_for_action ("win.forward(1)", {"<Alt>Right", "XF86Forward"});
marlin_app.set_accels_for_action ("win.back(1)", {"<Alt>Left", "XF86Back"});
marlin_app.set_accels_for_action ("win.tab::TAB", {"<Shift><Ctrl>K"});
marlin_app.set_accels_for_action ("win.tab::WINDOW", {"<Ctrl><Alt>N"});
marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl>Left"});

// Make sure Left and Right arrow keys are mapped logically based on layout direction
if (Gtk.StateFlags.DIR_RTL in get_style_context ().get_state ()) {
marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl><Alt>Right"});
marlin_app.set_accels_for_action ("win.focus-current-container", {"<Ctrl><Alt>Left"});
marlin_app.set_accels_for_action ("win.forward(1)", {"<Alt>Right", "XF86Forward"});
} else {
marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl><Alt>Left"});
marlin_app.set_accels_for_action ("win.focus-current-container", {"<Ctrl><Alt>Right"});
marlin_app.set_accels_for_action ("win.back(1)", {"<Alt>Left", "XF86Back"});
}
}

build_window ();
Expand All @@ -188,15 +197,19 @@ public class Files.View.Window : Hdy.ApplicationWindow {

private void build_window () {
button_back = new View.Chrome.ButtonWithMenu ("go-previous-symbolic");

button_back.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Left"}, _("Previous"));
button_back.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);

button_forward = new View.Chrome.ButtonWithMenu ("go-next-symbolic");

button_forward.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Right"}, _("Next"));
button_forward.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);

if (Gtk.StateFlags.DIR_RTL in get_style_context ().get_state ()) {
button_back.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Right"}, _("Previous"));
button_forward.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Left"}, _("Next"));
} else {
button_back.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Left"}, _("Previous"));
button_forward.tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>Right"}, _("Next"));
}

view_switcher = new Chrome.ViewSwitcher ((SimpleAction)lookup_action ("view-mode")) {
margin_end = 20
};
Expand Down Expand Up @@ -1006,6 +1019,10 @@ public class Files.View.Window : Hdy.ApplicationWindow {
sidebar.focus ();
}

private void action_focus_current_container () {
grab_focus ();
}

private void before_undo_redo () {
doing_undo_redo = true;
update_undo_actions ();
Expand Down