[PATCH 1/1] git-gui: fix colored label backgrounds when using themed widgets
- From
Stefan Haller <stefan@haller-berlin.de>
- Date
- Nov 22, 2020, 19:45 UTC
- Message-ID
- <20201122194537.41870-2-stefan@haller-berlin.de>
- In-Reply-To
- <20201122194537.41870-1-stefan@haller-berlin.de>
The aqua theme on Mac doesn't support changing the background color for labels and frames [1]. Since the red, green, and yellow backgrounds of the labels for unstaged and staged files and the diff pane are so important design elements of git gui's main window, it's not acceptable for them to have grey backgrounds on Mac.
To work around this, simply use non-themed widgets for all labels on Mac. This is not a big problem because labels don't look extremely different between the themed and non-themed versions. There are subtle differences, but they are not as bad as having the wrong background color.
[1] https://stackoverflow.com/a/6723911
Signed-off-by: Stefan Haller <stefan@haller-berlin.de> --- lib/themed.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/themed.tcl b/lib/themed.tcl index 83e3ac7..02aae90 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 { -- 2.29.0.18.gf8c967e53c