diff options
| author |  Clemens Buchacher <drizzd@gmx.net> | 2018-03-03 23:39:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-05 23:46:45 -0800 |
| commit | f50d5055bf9bb2aa35e629d31943334afc4a9f10 (patch) | |
| tree | e1732e28baa1ee9ace988f8bc35c69aa4a2782de | |
| parent | Merge remote-tracking branch 'philoakley/dup-gui' (diff) | |
| download | tgif-f50d5055bf9bb2aa35e629d31943334afc4a9f10.tar.xz | |
git-gui: workaround ttk:style theme use
Tk 8.5.7, which is the latest version on Centos 6, does not support
getting the current theme with [ttk::style theme use]. Use the existing
workaround for this in all places.
Signed-off-by: Clemens Buchacher <drizzd@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | lib/themed.tcl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/themed.tcl b/lib/themed.tcl index 351a712c8c..88b3119a75 100644 --- a/lib/themed.tcl +++ b/lib/themed.tcl @@ -1,6 +1,14 @@ # Functions for supporting the use of themed Tk widgets in git-gui. # Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net> +proc ttk_get_current_theme {} { + # Handle either current Tk or older versions of 8.5 + if {[catch {set theme [ttk::style theme use]}]} { + set theme $::ttk::currentTheme + } + return $theme +} + proc InitTheme {} { # Create a color label style (bg can be overridden by widget option) ttk::style layout Color.TLabel { @@ -28,10 +36,7 @@ proc InitTheme {} { } } - # Handle either current Tk or older versions of 8.5 - if {[catch {set theme [ttk::style theme use]}]} { - set theme $::ttk::currentTheme - } + set theme [ttk_get_current_theme] if {[lsearch -exact {default alt classic clam} $theme] != -1} { # Simple override of standard ttk::entry to change the field @@ -248,7 +253,7 @@ proc tspinbox {w args} { proc ttext {w args} { global use_ttk if {$use_ttk} { - switch -- [ttk::style theme use] { + switch -- [ttk_get_current_theme] { "vista" - "xpnative" { lappend args -highlightthickness 0 -borderwidth 0 } |