git-gui: Start blame windows as tall as possible

diff --git a/lib/blame.tcl b/lib/blame.tcl
index cb0f2c40b759848fd2fc5e3f42e89c01d7113712..77abd8291dda6f4a4f2be5df6444f4d7c07aaf40 100644 (file)
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -69,10 +69,10 @@ constructor new {i_commit i_path} {
        make_toplevel top w
        wm title $top "[appname] ([reponame]): File Viewer"
 
-       frame $w.header -background orange
+       frame $w.header -background gold
        label $w.header.commit_l \
                -text {Commit:} \
-               -background orange \
+               -background gold \
                -anchor w \
                -justify left
        set w_back $w.header.commit_b
@@ -81,8 +81,8 @@ constructor new {i_commit i_path} {
                -borderwidth 0 \
                -relief flat \
                -state disabled \
-               -background orange \
-               -activebackground orange
+               -background gold \
+               -activebackground gold
        bind $w_back <Button-1> "
                if {\[$w_back cget -state\] eq {normal}} {
                        [cb _history_menu]
@@ -90,17 +90,17 @@ constructor new {i_commit i_path} {
                "
        label $w.header.commit \
                -textvariable @commit \
-               -background orange \
+               -background gold \
                -anchor w \
                -justify left
        label $w.header.path_l \
                -text {File:} \
-               -background orange \
+               -background gold \
                -anchor w \
                -justify left
        set w_path $w.header.path
        label $w_path \
-               -background orange \
+               -background gold \
                -anchor w \
                -justify left
        pack $w.header.commit_l -side left
@@ -272,6 +272,8 @@ constructor new {i_commit i_path} {
                        set cursorW %W
                        tk_popup $w.ctxm %X %Y
                "
+               bind $i <Shift-Tab> "[list focus $w_cviewer];break"
+               bind $i <Tab>       "[list focus $w_cviewer];break"
        }
 
        foreach i [concat $w_columns $w_cviewer] {
@@ -287,9 +289,10 @@ constructor new {i_commit i_path} {
                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 <Tab>       "[list focus $w_file];break"
        bind $w_cviewer <Button-1> [list focus $w_cviewer]
-       bind $top <Visibility> [list focus $top]
-       bind $w_file <Destroy> [list delete_this $this]
+       bind $w_file    <Visibility> [list focus $w_file]
 
        grid configure $w.header -sticky ew
        grid configure $w.file_pane -sticky nsew
@@ -301,8 +304,9 @@ constructor new {i_commit i_path} {
 
        set req_w [winfo reqwidth  $top]
        set req_h [winfo reqheight $top]
+       set scr_h [expr {[winfo screenheight $top] - 100}]
        if {$req_w < 600} {set req_w 600}
-       if {$req_h < 400} {set req_h 400}
+       if {$req_h < $scr_h} {set req_h $scr_h}
        set g "${req_w}x${req_h}"
        wm geometry $top $g
        update
@@ -484,7 +488,11 @@ method _read_file {fd jump} {
 } ifdeleted { catch {close $fd} }
 
 method _exec_blame {cur_w cur_d options cur_s} {
-       set cmd [list nice git blame]
+       set cmd [list]
+       if {![is_Windows] || [is_Cygwin]} {
+               lappend cmd nice
+       }
+       lappend cmd git blame
        set cmd [concat $cmd $options]
        lappend cmd --incremental
        if {$commit eq {}} {