summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-01 07:19:27 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-06-06 05:26:45 (GMT)
commit74fe89857807c2194b1c202b4e429289d777ecb2 (patch)
tree62003872b0330d281cc4693968c8c00ea802b72f /lib
parent41bf23d6cc58c229e5e966a98c1b2c9cd06e95f7 (diff)
downloadgit-74fe89857807c2194b1c202b4e429289d777ecb2.zip
git-74fe89857807c2194b1c202b4e429289d777ecb2.tar.gz
git-74fe89857807c2194b1c202b4e429289d777ecb2.tar.bz2
git-gui: Highlight the blame commit header from everything else
The selected commit's blame header is now drawn in green, using the same background color that is shown in the main file content viewer. The result is a much better looking commit pane, as we use bold for header "keys" and proportional width fonts for the stuff that doesn't need to be fixed width to maintain its formatting. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/blame.tcl28
1 files changed, 23 insertions, 5 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index fef28a3..4730c2b 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -43,6 +43,7 @@ variable group_colors {
}
constructor new {i_commit i_path} {
+ variable active_color
global cursor_ptr
set commit $i_commit
@@ -139,6 +140,14 @@ constructor new {i_commit i_path} {
-xscrollcommand [list $w.cm.sbx set] \
-yscrollcommand [list $w.cm.sby set] \
-font font_diff
+ $w_cmit tag conf header_key \
+ -tabs {3c} \
+ -background $active_color \
+ -font font_uibold
+ $w_cmit tag conf header_val \
+ -background $active_color \
+ -font font_ui
+ $w_cmit tag raise sel
scrollbar $w.cm.sbx -orient h -command [list $w_cmit xview]
scrollbar $w.cm.sby -orient v -command [list $w_cmit yview]
pack $w.cm.sby -side right -fill y
@@ -449,12 +458,21 @@ method _showcommit {lno} {
set header($cmit,message) $msg
}
- $w_cmit insert end "commit $cmit
-Author: $author_name $author_email $author_time
-Committer: $committer_name $committer_email $committer_time
-Original File: [escape_path $line_file($lno)]
+ $w_cmit insert end "commit $cmit\n" header_key
+ $w_cmit insert end "Author:\t" header_key
+ $w_cmit insert end "$author_name $author_email" header_val
+ $w_cmit insert end "$author_time\n" header_val
+
+ $w_cmit insert end "Committer:\t" header_key
+ $w_cmit insert end "$committer_name $committer_email" header_val
+ $w_cmit insert end "$committer_time\n" header_val
+
+ if {$line_file($lno) ne $path} {
+ $w_cmit insert end "Original File:\t" header_key
+ $w_cmit insert end "[escape_path $line_file($lno)]\n" header_val
+ }
-$msg"
+ $w_cmit insert end "\n$msg"
}
$w_cmit conf -state disabled