mirror of
https://github.com/git/git.git
synced 2024-11-28 12:34:08 +08:00
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
This commit is contained in:
commit
7d6d21f5b9
@ -174,7 +174,7 @@ proc InitEntryFrame {} {
|
||||
|
||||
proc gold_frame {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
if {$use_ttk && ![is_MacOSX]} {
|
||||
eval [linsert $args 0 ttk::frame $w -style Gold.TFrame]
|
||||
} else {
|
||||
eval [linsert $args 0 frame $w -background gold]
|
||||
@ -183,7 +183,7 @@ proc gold_frame {w args} {
|
||||
|
||||
proc tlabel {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
if {$use_ttk && ![is_MacOSX]} {
|
||||
set cmd [list ttk::label $w -style Color.TLabel]
|
||||
foreach {k v} $args {
|
||||
switch -glob -- $k {
|
||||
|
Loading…
Reference in New Issue
Block a user