Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx> writes:
>It was possible to open the search input (Ctrl+S) and the goto-line input
>(Ctrl+G) at the same time. Prevent this.
>
>Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
>---
> lib/blame.tcl | 22 ++++++++++++++++------
> 1 files changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/lib/blame.tcl b/lib/blame.tcl
>index 2099776..691941e 100644
>--- a/lib/blame.tcl
>+++ b/lib/blame.tcl
>@@ -280,11 +280,11 @@ constructor new {i_commit i_path i_jump} {
> $w.ctxm add command \
> -label [mc "Find Text..."] \
> -accelerator F7 \
>- -command [list searchbar::show $finder]
>+ -command [cb _show_finder]
> $w.ctxm add command \
> -label [mc "Goto Line..."] \
> -accelerator "Ctrl-G" \
>- -command [list linebar::show $gotoline]
>+ -command [cb _show_linebar]
> menu $w.ctxm.enc
> build_encoding_menu $w.ctxm.enc [cb _setencoding]
> $w.ctxm add cascade \
>@@ -351,13 +351,13 @@ constructor new {i_commit i_path i_jump} {
> bind $w_cviewer <Tab> "[list focus $w_file];break"
> bind $w_cviewer <Button-1> [list focus $w_cviewer]
> bind $w_file <Visibility> [cb _focus_search $w_file]
>- bind $top <F7> [list searchbar::show $finder]
>- bind $top <Key-slash> [list searchbar::show $finder]
>- bind $top <Control-Key-s> [list searchbar::show $finder]
>+ bind $top <F7> [cb _show_finder]
>+ bind $top <Key-slash> [cb _show_finder]
>+ bind $top <Control-Key-s> [cb _show_finder]
> bind $top <Escape> [list searchbar::hide $finder]
> bind $top <F3> [list searchbar::find_next $finder]
> bind $top <Shift-F3> [list searchbar::find_prev $finder]
>- bind $top <Control-Key-g> [list linebar::show $gotoline]
>+ bind $top <Control-Key-g> [cb _show_linebar]
> catch { bind $top <Shift-Key-XF86_Switch_VT_3> [list searchbar::find_prev $finder] }
>
> grid configure $w.header -sticky ew
>@@ -1349,4 +1349,14 @@ method _resize {new_height} {
> set old_height $new_height
> }
>
>+method _show_finder {} {
>+ linebar::hide $gotoline
>+ searchbar::show $finder
>+}
>+
>+method _show_linebar {} {
>+ searchbar::hide $finder
>+ linebar::show $gotoline
>+}
>+
> }
Looks good. Will apply.
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html