diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-11-09 18:36:50 +0300 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-11-11 09:29:36 -0800 |
| commit | b28ebab294fb13f1bb5cd36ab9774a6dcf50a004 (patch) | |
| tree | 527b10bce80791841a45a63d2896abef2b775615 /lib/blame.tcl | |
| parent | git-gui: Update German translation. (diff) | |
| download | tgif-b28ebab294fb13f1bb5cd36ab9774a6dcf50a004.tar.xz | |
git-gui: Fix focus transition in the blame viewer.
Now that the blame viewer has a search panel, it should be
taken into account by the focus transition code. Otherwise
showing a commit tip (by accidentally moving the mouse to
the text frame) causes the focus to transfer away from the
search field.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/blame.tcl')
| -rw-r--r-- | lib/blame.tcl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl index 765d08c004..642f5cab86 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -321,7 +321,7 @@ constructor new {i_commit i_path i_jump} { tk_popup $w.ctxm %X %Y " bind $i <Shift-Tab> "[list focus $w_cviewer];break" - bind $i <Tab> "[list focus $w_cviewer];break" + bind $i <Tab> "[cb _focus_search $w_cviewer];break" } foreach i [concat $w_columns $w_cviewer] { @@ -337,10 +337,10 @@ constructor new {i_commit i_path i_jump} { bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break} } - bind $w_cviewer <Shift-Tab> "[list focus $w_file];break" + bind $w_cviewer <Shift-Tab> "[cb _focus_search $w_file];break" bind $w_cviewer <Tab> "[list focus $w_file];break" - bind $w_cviewer <Button-1> [list focus $w_cviewer] - bind $w_file <Visibility> [list focus $w_file] + 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 <Escape> [list searchbar::hide $finder] bind $top <F3> [list searchbar::find_next $finder] @@ -382,6 +382,14 @@ constructor new {i_commit i_path i_jump} { _load $this $i_jump } +method _focus_search {win} { + if {[searchbar::visible $finder]} { + focus [searchbar::editor $finder] + } else { + focus $win + } +} + method _handle_destroy {win} { if {$win eq $w} { _kill $this |