summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-06 07:48:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-06 07:48:01 (GMT)
commit4891961105c3af1022b1166e8dc5d1fe154a74b7 (patch)
tree5ae565d4c46c4f1f0f24e7574c3a88a8cb2b0d90
parent7e31236f652ad9db221511eaf157ce0ef55585d6 (diff)
parentf50d5055bf9bb2aa35e629d31943334afc4a9f10 (diff)
downloadgit-4891961105c3af1022b1166e8dc5d1fe154a74b7.zip
git-4891961105c3af1022b1166e8dc5d1fe154a74b7.tar.gz
git-4891961105c3af1022b1166e8dc5d1fe154a74b7.tar.bz2
Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-style
* 'cb/ttk-style' of git-gui: git-gui: workaround ttk:style theme use
-rw-r--r--git-gui/lib/themed.tcl15
1 files changed, 10 insertions, 5 deletions
diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
index 351a712..88b3119 100644
--- a/git-gui/lib/themed.tcl
+++ b/git-gui/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
}