Re: [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4

2014-01-16 Thread Benoît Bourbié 
Hi All,

Max, you are right, my TK version is 8.4.
I applied the patch and it now works perfectly.

Thanks!!

Benoît

On Tue, Jan 14, 2014 at 5:58 PM, Max Kirillov m...@max630.net wrote:
 Since 918dbf58, 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 m...@max630.net
 ---
  git-gui/git-gui.sh | 32 +---
  1 file changed, 21 insertions(+), 11 deletions(-)

 diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
 index e2e710e..147be8c 100755
 --- a/git-gui/git-gui.sh
 +++ b/git-gui/git-gui.sh
 @@ -3196,18 +3196,28 @@ unset i

  # -- Diff and Commit Area
  #
 -${NS}::panedwindow .vpane.lower -orient vertical
 -${NS}::frame .vpane.lower.commarea
 -${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
 -.vpane.lower add .vpane.lower.diff
 -.vpane.lower add .vpane.lower.commarea
 -.vpane add .vpane.lower
 -if {$use_ttk} {
 -   .vpane.lower pane .vpane.lower.diff -weight 1
 -   .vpane.lower pane .vpane.lower.commarea -weight 0
 +if {$have_tk85} {
 +   ${NS}::panedwindow .vpane.lower -orient vertical
 +   ${NS}::frame .vpane.lower.commarea
 +   ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 
 500
 +   .vpane.lower add .vpane.lower.diff
 +   .vpane.lower add .vpane.lower.commarea
 +   .vpane add .vpane.lower
 +   if {$use_ttk} {
 +   .vpane.lower pane .vpane.lower.diff -weight 1
 +   .vpane.lower pane .vpane.lower.commarea -weight 0
 +   } else {
 +   .vpane.lower paneconfigure .vpane.lower.diff -stretch always
 +   .vpane.lower paneconfigure .vpane.lower.commarea -stretch 
 never
 +   }
  } else {
 -   .vpane.lower paneconfigure .vpane.lower.diff -stretch always
 -   .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
 +   frame .vpane.lower -height 300 -width 400
 +   frame .vpane.lower.commarea
 +   frame .vpane.lower.diff -relief sunken -borderwidth 1
 +   pack .vpane.lower.diff -fill both -expand 1
 +   pack .vpane.lower.commarea -side bottom -fill x
 +   .vpane add .vpane.lower
 +   .vpane paneconfigure .vpane.lower -sticky nsew
  }

  # -- Commit Area Buttons
 --
 1.8.4.2.1566.g3c1a064
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4

2014-01-14 Thread Max Kirillov 
Since 918dbf58, 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 m...@max630.net
---
 git-gui/git-gui.sh | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index e2e710e..147be8c 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3196,18 +3196,28 @@ unset i
 
 # -- Diff and Commit Area
 #
-${NS}::panedwindow .vpane.lower -orient vertical
-${NS}::frame .vpane.lower.commarea
-${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
-.vpane.lower add .vpane.lower.diff
-.vpane.lower add .vpane.lower.commarea
-.vpane add .vpane.lower
-if {$use_ttk} {
-   .vpane.lower pane .vpane.lower.diff -weight 1
-   .vpane.lower pane .vpane.lower.commarea -weight 0
+if {$have_tk85} {
+   ${NS}::panedwindow .vpane.lower -orient vertical
+   ${NS}::frame .vpane.lower.commarea
+   ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
+   .vpane.lower add .vpane.lower.diff
+   .vpane.lower add .vpane.lower.commarea
+   .vpane add .vpane.lower
+   if {$use_ttk} {
+   .vpane.lower pane .vpane.lower.diff -weight 1
+   .vpane.lower pane .vpane.lower.commarea -weight 0
+   } else {
+   .vpane.lower paneconfigure .vpane.lower.diff -stretch always
+   .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
+   }
 } else {
-   .vpane.lower paneconfigure .vpane.lower.diff -stretch always
-   .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
+   frame .vpane.lower -height 300 -width 400
+   frame .vpane.lower.commarea
+   frame .vpane.lower.diff -relief sunken -borderwidth 1
+   pack .vpane.lower.diff -fill both -expand 1
+   pack .vpane.lower.commarea -side bottom -fill x
+   .vpane add .vpane.lower
+   .vpane paneconfigure .vpane.lower -sticky nsew
 }
 
 # -- Commit Area Buttons
-- 
1.8.4.2.1566.g3c1a064
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html