From aa0f6b37bd7884c0a3682f9d32841ebdf77abdc5 Mon Sep 17 00:00:00 2001
From: chenqiudu <chenqiudu@kuaishou.com>
Date: Tue, 23 Jul 2024 20:50:02 +0800
Subject: [PATCH] Backends: OSX: fixed NSAppKitVersion version limit for
 setWantsBestResolutionOpenGLSurface usage. (#7814)

---
 backends/imgui_impl_osx.mm | 2 +-
 docs/CHANGELOG.txt         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backends/imgui_impl_osx.mm b/backends/imgui_impl_osx.mm
index fe7f53472..6b29a3c1e 100644
--- a/backends/imgui_impl_osx.mm
+++ b/backends/imgui_impl_osx.mm
@@ -919,7 +919,7 @@ static void ImGui_ImplOSX_CreateWindow(ImGuiViewport* viewport)
     window.opaque = YES;
 
     KeyEventResponder* view = [[KeyEventResponder alloc] initWithFrame:rect];
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
+    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6 && ceil(NSAppKitVersionNumber) < NSAppKitVersionNumber10_15)
         [view setWantsBestResolutionOpenGLSurface:YES];
 
     window.contentView = view;
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 68779cf02..e386ddc01 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -167,6 +167,8 @@ Other changes:
 
 Docking+Viewports Branch:
 
+- Backends: OSX: Fixed NSAppKitVersion version limit for setWantsBestResolutionOpenGLSurface
+  usage. (#7814) [@YGXXD]
 - Backends: SDL3: Fixed a bug preventing ImGuiViewportFlags_NoFocusOnAppearing support from
   working (Windows only).