[PATCH 2/2] gitk: keep author and date colums to a minimal width on resize

From

GMGeorg Müller <georgmueller@gmx.net>

Date

Jul 8, 2023, 10:55 UTC

Message-ID

<20230708105546.2945446-4-georgmueller@gmx.net>

In-Reply-To

<20230708105546.2945446-2-georgmueller@gmx.net>

Signed-off-by: Georg Müller <georgmueller@gmx.net>
---
 gitk-git/gitk | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 0f229aadd7..819e059599 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2973,7 +2973,7 @@ proc savestuff {w} {
 }

 proc resizeclistpanes {win w} {
-    global oldwidth oldsash use_ttk
+    global oldwidth oldsash use_ttk charspc
     if {[info exists oldwidth($win)]} {
         if {[info exists oldsash($win)]} {
             set s0 [lindex $oldsash($win) 0]
@@ -3007,7 +3007,16 @@ proc resizeclistpanes {win w} {
                     set sash0 [expr {$sash1 - 20}]
                 }
             }
+            if {$w > 150 * $charspc} {
+                if {$sash1 + (20 * $charspc) > $w} {
+                    set sash1 [expr {$w - (20 * $charspc)}]
+                }
+                if {$sash0 + (30 * $charspc) > $sash1} {
+                    set sash0 [expr {$sash1 - (30 * $charspc)}]
+                }
+            }
         }
+
         if {$use_ttk} {
             $win sashpos 0 $sash0
             $win sashpos 1 $sash1
@@ -3023,7 +3032,7 @@ proc resizeclistpanes {win w} {
 }

 proc resizecdetpanes {win w} {
-    global oldwidth oldsash use_ttk
+    global oldwidth oldsash use_ttk charspc
     if {[info exists oldwidth($win)]} {
         if {[info exists oldsash($win)]} {
             set s0 $oldsash($win)
@@ -3046,6 +3055,11 @@ proc resizecdetpanes {win w} {
             if {$sash0 > $w - 15} {
                 set sash0 [expr {$w - 15}]
             }
+            if {$w > 150 * $charspc} {
+                if {$sash0 + (30 * $charspc) > $w} {
+                    set sash0 [expr {$w - (30 * $charspc)}]
+                }
+            }
         }
         if {$use_ttk} {
             $win sashpos 0 $sash0
--
2.41.0