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

From: Benoît Bourbié <benoit.bourbie@gmail.com>
Date: Jan 16, 2014, 16:39 UTC
Message-ID: <CANJSc_uhYU7EPZ89dbEQhc8QM4e-yLj2qhQOJMQyzU-2RdZn8A@mail.gmail.com>
In-Reply-To: <20140114235809.GA15510@wheezy.local>

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 <max@max630.net> wrote:

Show 59 quoted lines

> 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 <max@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