summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLibravatar Pratyush Yadav <me@yadavpratyush.com>2020-12-18 00:32:06 +0530
committerLibravatar Pratyush Yadav <me@yadavpratyush.com>2020-12-18 00:32:06 +0530
commit7d6d21f5b92f91b16c67a64e4edaa5860e6c2b4c (patch)
tree0b6c1c964db6338ce9a6f5b35b2e39ad9afceb8c /lib
parentMerge branch 'da/askpass-mask-checkbox' (diff)
parentgit-gui: fix colored label backgrounds when using themed widgets (diff)
downloadtgif-7d6d21f5b92f91b16c67a64e4edaa5860e6c2b4c.tar.xz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/themed.tcl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/themed.tcl b/lib/themed.tcl
index 83e3ac795f..02aae90144 100644
--- a/lib/themed.tcl
+++ b/lib/themed.tcl
@@ -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 {