Skip to content

Commit

Permalink
When refreshing directory windows with ESC, only force media change
Browse files Browse the repository at this point in the history
when shift is also pressed.
  • Loading branch information
th-otto committed Nov 29, 2023
1 parent dcf6781 commit a2b889d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/de/teradesk.stg
Original file line number Diff line number Diff line change
Expand Up @@ -3819,7 +3819,7 @@ Mit [Backspace] wird der zuletzt eingegebene Buchstabe im Auto-Selektor
gel�scht.

Mit [Esc] wird der Verzeichnis-@{"Inhalt" LINK "Main"} neu eingelesen und im Fenster dar-
gestellt.
gestellt. Mit [Shift][Esc] wird vorher ein Medien-Wechsel erzwungen.

Dateien und Ordner, die in ein Verzeichnis-Fenster ge-'dragged' werden,
werden je nach zus�tzlich gedr�ckter Taste in dieses Verzeichnis kopiert,
Expand Down
3 changes: 2 additions & 1 deletion doc/en/teradesk.stg
Original file line number Diff line number Diff line change
Expand Up @@ -3964,7 +3964,8 @@ is pressed. One can use [Backspace] to delete the last character
entered into the autoselector.

Pressing the [Esc] key causes the directory of the top window to be
read again and the window contents to be refreshed.
read again and the window contents to be refreshed. To force a media
change, use [Shift][Esc].

Files and folders dragged to a directory window will be either copied
or moved to that directory, depending on the keyboard key being held
Expand Down
3 changes: 2 additions & 1 deletion window.c
Original file line number Diff line number Diff line change
Expand Up @@ -3279,7 +3279,8 @@ _WORD wd_type_hndlkey(WINDOW *w, _WORD scancode, _WORD keystate)
{
/* refresh a directory window */

force_mediach(((DIR_WINDOW *) w)->path);
if (keystate & (K_LSHIFT | K_RSHIFT))
force_mediach(((DIR_WINDOW *) w)->path);
dir_refresh_wd((DIR_WINDOW *) w);
} else
{
Expand Down

0 comments on commit a2b889d

Please sign in to comment.