Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 02f6cfb

Browse files
max630patthoyts
authored andcommitted
git-gui: fallback right pane to packed widgets with Tk 8.4
Since 918dbf5, git-gui crashes if started with Tk 8.4. The reason is that tk < 8.5 does not support -stretch option for panedwindow. Without the option it's not possible to properly expand the right half - the commit area is expanded, while desired behavior is to expand the diff area. So the whole feature should be disabled with Tk version less than 8.5. Signed-off-by: Max Kirillov <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
1 parent 1ea11f0 commit 02f6cfb

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

git-gui.sh

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3224,18 +3224,28 @@ unset i
32243224
32253225
# -- Diff and Commit Area
32263226
#
3227-
${NS}::panedwindow .vpane.lower -orient vertical
3228-
${NS}::frame .vpane.lower.commarea
3229-
${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
3230-
.vpane.lower add .vpane.lower.diff
3231-
.vpane.lower add .vpane.lower.commarea
3232-
.vpane add .vpane.lower
3233-
if {$use_ttk} {
3234-
.vpane.lower pane .vpane.lower.diff -weight 1
3235-
.vpane.lower pane .vpane.lower.commarea -weight 0
3227+
if {$have_tk85} {
3228+
${NS}::panedwindow .vpane.lower -orient vertical
3229+
${NS}::frame .vpane.lower.commarea
3230+
${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
3231+
.vpane.lower add .vpane.lower.diff
3232+
.vpane.lower add .vpane.lower.commarea
3233+
.vpane add .vpane.lower
3234+
if {$use_ttk} {
3235+
.vpane.lower pane .vpane.lower.diff -weight 1
3236+
.vpane.lower pane .vpane.lower.commarea -weight 0
3237+
} else {
3238+
.vpane.lower paneconfigure .vpane.lower.diff -stretch always
3239+
.vpane.lower paneconfigure .vpane.lower.commarea -stretch never
3240+
}
32363241
} else {
3237-
.vpane.lower paneconfigure .vpane.lower.diff -stretch always
3238-
.vpane.lower paneconfigure .vpane.lower.commarea -stretch never
3242+
frame .vpane.lower -height 300 -width 400
3243+
frame .vpane.lower.commarea
3244+
frame .vpane.lower.diff -relief sunken -borderwidth 1
3245+
pack .vpane.lower.diff -fill both -expand 1
3246+
pack .vpane.lower.commarea -side bottom -fill x
3247+
.vpane add .vpane.lower
3248+
.vpane paneconfigure .vpane.lower -sticky nsew
32393249
}
32403250
32413251
# -- Commit Area Buttons

0 commit comments

Comments
 (0)