feat: fix macOS runtime error due to early initialisation for CefString

CefView · Oct 30, 2024 · bdc9f9e · bdc9f9e
1 parent 4ca01b2
commit bdc9f9e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/cmake/CefViewCoreConfig.cmake b/cmake/CefViewCoreConfig.cmake
@@ -4,7 +4,7 @@ include(FetchContent)
 FetchContent_Declare(
     CefViewCore
     GIT_REPOSITORY https://github.com/CefView/CefViewCore.git
-    GIT_TAG 1cc9a2a1085520bc31609c623ae338e699498bb7
+    GIT_TAG 0aa55c8ae761f7b62286ef8ca68db33e6328c41c
 )
 
 # set CEF version to be used

diff --git a/include/QCefView.h b/include/QCefView.h
@@ -1,4 +1,4 @@
-/*
+/*
  * File: QCefView.h
  * Project: QCefView
  * Created: 29th March 2016
@@ -57,6 +57,11 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
   /// The main frame identity
   /// </summary>
   static const QCefFrameId MainFrameID;
+
+  /// <summary>
+  /// The identifier for all frames
+  /// </summary>
+  static const QCefFrameId AllFrameID;
 
   /// <summary>
   /// Represents the CEF pop-up windows open disposition

diff --git a/include/QCefView_global.h b/include/QCefView_global.h
@@ -14,7 +14,7 @@
 #pragma region qt_headers
 #include <QtCore/qglobal.h>
 #include <QMetaType>
-#pragma endregion qt_headers
+#pragma endregion 
 
 #ifdef QCEFVIEW_STATIC
     // Static library, no need export

diff --git a/src/QCefView.cpp b/src/QCefView.cpp
@@ -1,4 +1,4 @@
-#include <QCefView.h>
+#include <QCefView.h>
 
 #pragma region qt_headers
 #include <QPainter>
@@ -16,8 +16,10 @@
 
 #if CEF_VERSION_MAJOR < 122
 const QCefFrameId QCefView::MainFrameID = 0;
+const QCefFrameId QCefView::AllFrameID = -1;
 #else
 const QCefFrameId QCefView::MainFrameID = "0";
+const QCefFrameId QCefView::AllFrameID = "-1";
 #endif
 
 QCefView::QCefView(const QString& url,
@@ -166,7 +168,7 @@ QCefView::triggerEvent(const QCefEvent& event)
   Q_D(QCefView);
 
   return d->triggerEvent(
-    event.eventName(), event.d_func()->args, ValueConvertor::FrameIdC2Q(CefViewBrowserClient::MAIN_FRAME));
+                         event.eventName(), event.d_func()->args, QCefView::MainFrameID);
 }
 
 bool
@@ -183,7 +185,7 @@ QCefView::broadcastEvent(const QCefEvent& event)
   Q_D(QCefView);
 
   return d->triggerEvent(
-    event.eventName(), event.d_func()->args, ValueConvertor::FrameIdC2Q(CefViewBrowserClient::ALL_FRAMES));
+                         event.eventName(), event.d_func()->args, QCefView::AllFrameID);
 }
 
 bool

diff --git a/src/details/QCefViewPrivate.cpp b/src/details/QCefViewPrivate.cpp
@@ -1,4 +1,4 @@
-#include "QCefViewPrivate.h"
+#include "QCefViewPrivate.h"
 
 #pragma region stl_headers
 #include <stdexcept>
@@ -1217,7 +1217,7 @@ QCefViewPrivate::browserStopLoad()
 bool
 QCefViewPrivate::triggerEvent(const QString& name,
                               const QVariantList& args,
-                              const QCefFrameId& frameId /*= CefViewBrowserHandler::MAIN_FRAME*/)
+                              const QCefFrameId& frameId /*= QCefView::MainFrameID*/)
 {
   if (!name.isEmpty()) {
     return sendEventNotifyMessage(frameId, name, args);

diff --git a/src/details/QCefViewPrivate.h b/src/details/QCefViewPrivate.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #pragma region qt_headers
 #include <QMenu>
 #include <QMutex>
@@ -315,7 +315,7 @@ public slots:
 
   bool triggerEvent(const QString& name,
                     const QVariantList& args,
-                    const QCefFrameId& frameId = ValueConvertor::FrameIdC2Q(CefViewBrowserClient::MAIN_FRAME));
+                    const QCefFrameId& frameId = QCefView::MainFrameID);
 
   bool responseQCefQuery(const QCefQuery& query);