From 0a45737782226d4449a4f04adcd611d0cf2c387e Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Wed, 27 Jan 2021 10:05:52 +1100 Subject: [PATCH] Fix panel build error on macOS The original goal was to simplify the init function across all platforms, but to solve the build issue for now, an extra check specific to macOS is added. Also bumps version to 2.13.1. --- browser-version.h | 2 +- panel/browser-panel.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser-version.h b/browser-version.h index 99c5e77b6..7665de323 100644 --- a/browser-version.h +++ b/browser-version.h @@ -2,7 +2,7 @@ #define OBS_BROWSER_VERSION_MAJOR 2 #define OBS_BROWSER_VERSION_MINOR 13 -#define OBS_BROWSER_VERSION_PATCH 0 +#define OBS_BROWSER_VERSION_PATCH 1 #ifndef MAKE_SEMANTIC_VERSION #define MAKE_SEMANTIC_VERSION(major, minor, patch) \ diff --git a/panel/browser-panel.cpp b/panel/browser-panel.cpp index 785542da4..c5fca2495 100644 --- a/panel/browser-panel.cpp +++ b/panel/browser-panel.cpp @@ -260,7 +260,13 @@ void QCefWidgetInternal::Init() #else CefRect rc = {0, 0, size.width(), size.height()}; #endif + +#ifdef __APPLE__ + windowInfo.SetAsChild((CefWindowHandle)handle, 0, 0, + size.width(), size.height()); +#elif windowInfo.SetAsChild((CefWindowHandle)handle, rc); +#endif CefRefPtr browserClient = new QCefBrowserClient(this, script, allowAllPopups_);