Move browser-panel ObjC code to Objective-C file; Add more null checks

obsproject · May 3, 2023 · 5e4865a · 5e4865a
1 parent 594115a
commit 5e4865a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/cmake/feature-panels.cmake b/cmake/feature-panels.cmake
@@ -12,6 +12,10 @@ target_compile_definitions(browser-panels INTERFACE BROWSER_AVAILABLE)
 target_sources(obs-browser PRIVATE panel/browser-panel-client.hpp panel/browser-panel-internal.hpp
  panel/browser-panel.cpp panel/browser-panel-client.cpp)
 
+if(OS_MACOS)
+ target_sources(obs-browser PRIVATE panel/browser-panel-macos.m)
+endif()
+
 target_link_libraries(obs-browser PRIVATE OBS::browser-panels Qt::Widgets)
 
 set_target_properties(

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
@@ -244,6 +244,7 @@ if(ENABLE_BROWSER_PANELS)
  target_link_libraries(obs-browser-panels INTERFACE CEF::Wrapper)
 
  if(OS_MACOS)
+ target_sources(obs-browser PRIVATE panel/browser-panel-macos.m)
  target_link_libraries(obs-browser-panels INTERFACE objc)
  endif()
 

diff --git a/panel/browser-panel-macos.m b/panel/browser-panel-macos.m
@@ -0,0 +1,15 @@
+#import <AppKit/AppKit.h>
+
+void RemoveNSViewFromSuperview(void *view)
+{
+ if (!view)
+ return;
+
+ if (!*((bool *)view))
+ return;
+
+ // CefBrowserHostView is a subclass of NSView
+ // and we just need the superclass here
+ NSView *nsview = (NSView *)view;
+ [nsview removeFromSuperview];
+}
diff --git a/panel/browser-panel.cpp b/panel/browser-panel.cpp
@@ -11,10 +11,6 @@
 #include <QThread>
 #endif
 
-#ifdef __APPLE__
-#include <objc/objc.h>
-#endif
-
 #include <obs-module.h>
 #include <util/threading.h>
 #include <util/base.h>
@@ -161,6 +157,10 @@ QCefWidgetInternal::~QCefWidgetInternal()
  closeBrowser();
 }
 
+#ifdef __APPLE__
+extern "C" void RemoveNSViewFromSuperview(void *view);
+#endif
+
 void QCefWidgetInternal::closeBrowser()
 {
  CefRefPtr<CefBrowser> browser = cefBrowser;
@@ -203,10 +203,8 @@ void QCefWidgetInternal::closeBrowser()
  }
 #elif __APPLE__
  // felt hacky, might delete later
- void *view = (id)cefBrowser->GetHost()->GetWindowHandle();
- if (*((bool *)view))
- ((void (*)(id, SEL))objc_msgSend)(
- (id)view, sel_getUid("removeFromSuperview"));
+ void *view = cefBrowser->GetHost()->GetWindowHandle();
+ RemoveNSViewFromSuperview(view);
 #endif
 
  destroyBrowser(browser);