]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-gui: always use themed widgets from ttk
authorMark Levedahl <mlevedahl@gmail.com>
Wed, 21 May 2025 20:31:14 +0000 (16:31 -0400)
committerMark Levedahl <mlevedahl@gmail.com>
Sat, 19 Jul 2025 03:48:34 +0000 (23:48 -0400)
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>
git-gui.sh

index d395634caf2877b89145b58c34bef0993f8779a1..a484083bcd56ab01e368eeb588034802b872efa9 100755 (executable)
@@ -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]