Skip to content

Commit

Permalink
git-gui: Always offer scrollbars for branch lists.
Browse files Browse the repository at this point in the history
Anytime we use a listbox to show branch names its possible for the
listbox to exceed 10 entries (actually its probably very common).
So we should always offer a scrollbar for the Y axis on these
listboxes.  I just forgot to add it when I defined them.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Shawn O. Pearce committed Jan 26, 2007
1 parent 5f39dbf commit 729a6f6
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2129,16 +2129,19 @@ proc do_delete_branch {} {
-font font_ui
listbox $w.list.l \
-height 10 \
-width 50 \
-width 70 \
-selectmode extended \
-yscrollcommand [list $w.list.sby set] \
-font font_ui
foreach h $all_heads {
if {$h ne $current_branch} {
$w.list.l insert end $h
}
}
pack $w.list.l -fill both -pady 5 -padx 5
pack $w.list -fill both -pady 5 -padx 5
scrollbar $w.list.sby -command [list $w.list.l yview]
pack $w.list.sby -side right -fill y
pack $w.list.l -side left -fill both -expand 1
pack $w.list -fill both -expand 1 -pady 5 -padx 5

labelframe $w.validate \
-text {Delete Only If} \
Expand Down Expand Up @@ -2510,17 +2513,20 @@ proc do_push_anywhere {} {
-font font_ui
listbox $w.source.l \
-height 10 \
-width 50 \
-width 70 \
-selectmode extended \
-yscrollcommand [list $w.source.sby set] \
-font font_ui
foreach h $all_heads {
$w.source.l insert end $h
if {$h eq $current_branch} {
$w.source.l select set end
}
}
pack $w.source.l -fill both -pady 5 -padx 5
pack $w.source -fill both -pady 5 -padx 5
scrollbar $w.source.sby -command [list $w.source.l yview]
pack $w.source.sby -side right -fill y
pack $w.source.l -side left -fill both -expand 1
pack $w.source -fill both -expand 1 -pady 5 -padx 5

labelframe $w.dest \
-text {Destination Repository} \
Expand Down Expand Up @@ -2782,7 +2788,7 @@ proc do_local_merge {} {
-font font_ui
listbox $w.source.l \
-height 10 \
-width 25 \
-width 70 \
-selectmode extended \
-yscrollcommand [list $w.source.sby set] \
-font font_ui
Expand Down

0 comments on commit 729a6f6

Please sign in to comment.