kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sh/macos-labels' 

Fix label background colors on MacOS when ttk is enabled.

* sh/macos-labels:
  git-gui: fix colored label backgrounds when using themed widgets
maint
Pratyush Yadav 2020-12-18 00:32:06 +05:30
parent 3e5c911288 f9481b195b
commit 7d6d21f5b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/themed.tcl
View File

@ -174,7 +174,7 @@ proc InitEntryFrame {} {


proc gold_frame {w args} { proc gold_frame {w args} {
global use_ttk global use_ttk
if {$use_ttk} { if {$use_ttk && ![is_MacOSX]} {
eval [linsert $args 0 ttk::frame $w -style Gold.TFrame] eval [linsert $args 0 ttk::frame $w -style Gold.TFrame]
} else { } else {
eval [linsert $args 0 frame $w -background gold] eval [linsert $args 0 frame $w -background gold]
@ -183,7 +183,7 @@ proc gold_frame {w args} {


proc tlabel {w args} { proc tlabel {w args} {
global use_ttk global use_ttk
if {$use_ttk} { if {$use_ttk && ![is_MacOSX]} {
set cmd [list ttk::label $w -style Color.TLabel] set cmd [list ttk::label $w -style Color.TLabel]
foreach {k v} $args { foreach {k v} $args {
switch -glob -- $k { switch -glob -- $k {