From: Mark Levedahl <mlevedahl@gmail.com>
Date: Wed, 21 May 2025 20:31:14 +0000 (-0400)
Subject: git-gui: always use themed widgets from ttk
X-Git-Tag: v2.51.0-rc0~46^2~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed7d2af78cd4cb8c9a8db4f2f60f56101d9439f8;p=thirdparty%2Fgit.git

git-gui: always use themed widgets from ttk

git-gui optionally uses themed ui elements from ttk, but the full set of
ttk ui elements is always available with Tk 8.6.  Keeping code making
ttk use optional increases maintenance burden for no benefit.  Let's use
ttk always, allowing removal of alternate code paths in subsequent
patches.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---

diff --git a/git-gui.sh b/git-gui.sh
index d395634caf..a484083bcd 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -913,15 +913,11 @@ proc apply_config {} {
 	}
 
 	global use_ttk NS
-	set use_ttk 0
-	set NS {}
-	if {$repo_config(gui.usettk)} {
-		set use_ttk 1
-		set NS ttk
-		bind [winfo class .] <<ThemeChanged>> [list InitTheme]
-		pave_toplevel .
-		color::sync_with_theme
-	}
+	set use_ttk 1
+	set NS ttk
+	bind [winfo class .] <<ThemeChanged>> [list InitTheme]
+	pave_toplevel .
+	color::sync_with_theme
 
 	global comment_string
 	set comment_string [get_config core.commentstring]