Skip to content

Commit 34076e0

Browse files
authored
Fix OSX backend following ImGui update (#18)
1 parent 66c704e commit 34076e0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

libs/imgui/backends/imgui_impl_osx.mm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#import "imgui_impl_osx.h"
2929
#import <Cocoa/Cocoa.h>
3030
#import <Carbon/Carbon.h>
31-
#import <GameController/GameController.h>
3231
#import <time.h>
3332

3433
// CHANGELOG
@@ -447,7 +446,7 @@ bool ImGui_ImplOSX_Init(NSView* view)
447446
bd->Observer = [ImGuiObserver new];
448447
bd->Window = view.window ?: NSApp.orderedWindows.firstObject;
449448
ImGuiViewport* main_viewport = ImGui::GetMainViewport();
450-
main_viewport->PlatformHandle = main_viewport->PlatformHandleRaw = (__bridge_retained void*)bd->Window;
449+
main_viewport->PlatformHandle = main_viewport->PlatformHandleRaw = (void*)bd->Window; //fix(zig-gamedev)
451450
ImGui_ImplOSX_UpdateMonitors();
452451
ImGui_ImplOSX_InitMultiViewportSupport();
453452

@@ -883,12 +882,12 @@ static void ImGui_ImplOSX_CreateWindow(ImGuiViewport* viewport)
883882
data->Window = window;
884883
data->WindowOwned = true;
885884
viewport->PlatformRequestResize = false;
886-
viewport->PlatformHandle = viewport->PlatformHandleRaw = (__bridge_retained void*)window;
885+
viewport->PlatformHandle = viewport->PlatformHandleRaw = (void*)window; // fix(zig-gamedev)
887886
}
888887

889888
static void ImGui_ImplOSX_DestroyWindow(ImGuiViewport* viewport)
890889
{
891-
NSWindow* window = (__bridge_transfer NSWindow*)viewport->PlatformHandleRaw;
890+
NSWindow* window = (NSWindow*)viewport->PlatformHandleRaw; // fix(zig-gamedev)
892891
window = nil;
893892

894893
if (ImGuiViewportDataOSX* data = (ImGuiViewportDataOSX*)viewport->PlatformUserData)
@@ -1040,7 +1039,7 @@ static void ImGui_ImplOSX_UpdateMonitors()
10401039
imgui_monitor.WorkPos = ImVec2(visibleFrame.origin.x, visibleFrame.origin.y);
10411040
imgui_monitor.WorkSize = ImVec2(visibleFrame.size.width, visibleFrame.size.height);
10421041
imgui_monitor.DpiScale = screen.backingScaleFactor;
1043-
imgui_monitor.PlatformHandle = (__bridge_retained void*)screen;
1042+
imgui_monitor.PlatformHandle = (void*)screen; // fix(zig-gamedev)
10441043

10451044
platform_io.Monitors.push_back(imgui_monitor);
10461045
}

0 commit comments

Comments
 (0)