diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-09 19:01:15 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-09 19:01:15 +0300 |
commit | f63ed76597b462c60b3a6ad89f8c165ffb87d00c (patch) | |
tree | 2aca3537930bce28acff14c0cee0a11fa1988661 /src/macos.m | |
parent | 5f9685010addd4a0f04c13f889856084381dd1c6 (diff) | |
parent | ee17ef3d0135027fbc4ff816dd9e793b4bb0b883 (diff) |
Merge branch 'dev' into work/typesetter
# Conflicts:
# src/gmdocument.c
# src/ui/documentwidget.c
# src/ui/inputwidget.h
Diffstat (limited to 'src/macos.m')
-rw-r--r-- | src/macos.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/macos.m b/src/macos.m index 709a97f7..6bacfdd1 100644 --- a/src/macos.m +++ b/src/macos.m | |||
@@ -60,8 +60,9 @@ static NSString *currentSystemAppearance_(void) { | |||
60 | } | 60 | } |
61 | 61 | ||
62 | iBool shouldDefaultToMetalRenderer_MacOS(void) { | 62 | iBool shouldDefaultToMetalRenderer_MacOS(void) { |
63 | return iFalse; /* | ||
63 | const iInt2 ver = macVer_(); | 64 | const iInt2 ver = macVer_(); |
64 | return ver.x > 10 || ver.y > 13; | 65 | return ver.x > 10 || ver.y > 13;*/ |
65 | } | 66 | } |
66 | 67 | ||
67 | /*----------------------------------------------------------------------------------------------*/ | 68 | /*----------------------------------------------------------------------------------------------*/ |