Merge pull request #83136 from bruvzg/occ_3x

[3.x] [macOS] Use occlusionState to determine when window is drawable.
godotengine · Nov 14, 2023 · 814400b · 814400b
2 parents b5081af + d4c2e7e
commit 814400b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
@@ -135,6 +135,7 @@ class OS_OSX : public OS_Unix {
 	bool resizable;
 	bool window_focused;
 	bool on_top;
+	bool is_visible;
 
 	Size2 window_size;
 	Rect2 restore_rect;

diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
@@ -463,6 +463,10 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification {
 	OS_OSX::singleton->window_focused = true;
 };
 
+- (void)windowDidChangeOcclusionState:(NSNotification *)notification {
+	OS_OSX::singleton->is_visible = ([OS_OSX::singleton->window_object occlusionState] & NSWindowOcclusionStateVisible) && [OS_OSX::singleton->window_object isVisible];
+}
+
 @end
 
 @interface GodotContentView : NSOpenGLView <NSTextInputClient> {
@@ -2410,7 +2414,7 @@ virtual void log_error(const char *p_function, const char *p_file, int p_line, c
 }
 
 bool OS_OSX::can_draw() const {
-	return true;
+	return is_visible;
 }
 
 void OS_OSX::set_clipboard(const String &p_text) {
@@ -3568,6 +3572,7 @@ void _update_keyboard_layouts() {
 	im_position = Point2();
 	layered_window = false;
 	autoreleasePool = [[NSAutoreleasePool alloc] init];
+	is_visible = true;
 
 	eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
 	ERR_FAIL_COND(!eventSource);