From a04867c5f45b126caafe9abccd9ecd00d3bc516f Mon Sep 17 00:00:00 2001 From: Nikita Prokopov Date: Tue, 16 Jan 2024 16:27:32 +0100 Subject: [PATCH] Fix fullscreen on macOS --- macos/cc/WindowMac.mm | 2 ++ script/build_utils.py | 3 ++- script/common.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macos/cc/WindowMac.mm b/macos/cc/WindowMac.mm index 7248794e..58341462 100644 --- a/macos/cc/WindowMac.mm +++ b/macos/cc/WindowMac.mm @@ -97,6 +97,8 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt return false; } + [fNSWindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; + fCursor = [kCursorCache objectAtIndex:0]; // create view diff --git a/script/build_utils.py b/script/build_utils.py index d4bc4046..a3f7986b 100644 --- a/script/build_utils.py +++ b/script/build_utils.py @@ -102,6 +102,7 @@ def javac(sources, target, classpath = [], modulepath = [], add_modules = [], re subprocess.check_call([ 'javac', '-encoding', 'UTF8', + '-Xlint:-options', *opts, '--release', release, *(['--class-path', classpath_join(classpath + [target])] if classpath else []), @@ -122,7 +123,7 @@ def jar(target: str, *content: List[Tuple[str, str]]) -> str: @functools.lru_cache(maxsize=1) def lombok(): - return fetch_maven('org.projectlombok', 'lombok', '1.18.22') + return fetch_maven('org.projectlombok', 'lombok', '1.18.30') def delombok(dirs: List[str], target: str, classpath: List[str] = [], modulepath: List[str] = []): sources = files(*[dir + "/**/*.java" for dir in dirs]) diff --git a/script/common.py b/script/common.py index a95ad202..3f3b0f7d 100644 --- a/script/common.py +++ b/script/common.py @@ -12,7 +12,7 @@ def deps_compile(): (args, _) = parser.parse_known_args() deps = [ - build_utils.fetch_maven('org.projectlombok', 'lombok', '1.18.22'), + build_utils.fetch_maven('org.projectlombok', 'lombok', '1.18.30'), build_utils.fetch_maven('org.jetbrains', 'annotations', '20.1.0') ]