git-gui: Display status on left in diff header.

Because the Tk pack layout manager gives all space to the right/bottom
most widget during expand/contract of the frame we were adding and
removing all space from the status area of the bar and not from the
file name, which is what we actually wanted.

A simple enough fix is to just put the status of the given file on
the left side of the diff viewer header rather than on the right.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2006-11-12 22:06:37 -05:00
parent 135f76ed99
commit 3e7b0e1d0a

22
git-gui
View File

@ -2281,6 +2281,13 @@ bind_button3 $ui_comm "tk_popup $ui_comm.ctxm %X %Y"
set ui_fname_value {}
set ui_fstatus_value {}
frame .vpane.lower.diff.header -background orange
label .vpane.lower.diff.header.l4 \
-textvariable ui_fstatus_value \
-background orange \
-width $max_status_desc \
-anchor w \
-justify left \
-font font_ui
label .vpane.lower.diff.header.l1 -text {File:} \
-background orange \
-font font_ui
@ -2288,6 +2295,7 @@ set ui_fname .vpane.lower.diff.header.l2
text $ui_fname \
-background orange \
-height 1 \
-wrap none \
-relief flat \
-state disabled \
-font font_ui
@ -2311,19 +2319,9 @@ proc $ui_fname.update {varname args} {
$ui_fname insert end [escape_path $ui_fname_value]
$ui_fname configure -state disabled
}
label .vpane.lower.diff.header.l3 -text {Status:} \
-background orange \
-font font_ui
label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
-background orange \
-width $max_status_desc \
-anchor w \
-justify left \
-font font_ui
pack .vpane.lower.diff.header.l4 -side left
pack .vpane.lower.diff.header.l1 -side left
pack .vpane.lower.diff.header.l2 -side left -fill x
pack .vpane.lower.diff.header.l4 -side right
pack .vpane.lower.diff.header.l3 -side right
pack $ui_fname -fill x
# -- Diff Body
frame .vpane.lower.diff.body