undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-style

Browse Source 
* 'cb/ttk-style' of git-gui:
  git-gui: workaround ttk:style theme use
This commit is contained in:
Junio C Hamano 2018-03-05 23:48:01 -08:00
commit 4891961105
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-gui/lib/themed.tcl
View File

@ -1,6 +1,14 @@
# Functions for supporting the use of themed Tk widgets in git-gui. # Functions for supporting the use of themed Tk widgets in git-gui.
# Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net> # 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 {} { proc InitTheme {} {
# Create a color label style (bg can be overridden by widget option) # Create a color label style (bg can be overridden by widget option)
ttk::style layout Color.TLabel { ttk::style layout Color.TLabel {
@ -28,10 +36,7 @@ proc InitTheme {} {
} }
} }
# Handle either current Tk or older versions of 8.5 set theme [ttk_get_current_theme]
if {[catch {set theme [ttk::style theme use]}]} {
set theme $::ttk::currentTheme
}
if {[lsearch -exact {default alt classic clam} $theme] != -1} { if {[lsearch -exact {default alt classic clam} $theme] != -1} {
# Simple override of standard ttk::entry to change the field # Simple override of standard ttk::entry to change the field
@ -248,7 +253,7 @@ proc tspinbox {w args} {
proc ttext {w args} { proc ttext {w args} {
global use_ttk global use_ttk
if {$use_ttk} { if {$use_ttk} {
switch -- [ttk::style theme use] { switch -- [ttk_get_current_theme] {
"vista" - "xpnative" { "vista" - "xpnative" {
lappend args -highlightthickness 0 -borderwidth 0 lappend args -highlightthickness 0 -borderwidth 0
} }