mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 11:46:11 +02:00
Code

git-gui: fix colored label backgrounds when using themed widgets 

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>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
This commit is contained in:
Stefan Haller 2020-11-22 20:45:37 +01:00 committed by Pratyush Yadav
parent 3e5c911288
commit f9481b195b
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} {
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 {