From aba962527b7342274e81aeadde0dc2747c94349e Mon Sep 17 00:00:00 2001 From: Prome Date: Mon, 12 Sep 2022 17:52:19 +0800 Subject: [PATCH] [macos] windows & macos should share same cpp code base --- {macos/Classes => common}/simple_app.cc | 0 {macos/Classes => common}/simple_app.h | 0 {macos/Classes => common}/simple_handler.cc | 0 {macos/Classes => common}/simple_handler.h | 0 example/macos/Podfile.lock | 2 +- lib/src/webview.dart | 3 +++ macos/Classes/CefWrapper.mm | 3 ++- macos/Classes/cef_bridge.cc | 8 ++++++++ macos/webview_cef.podspec | 2 +- 9 files changed, 15 insertions(+), 3 deletions(-) rename {macos/Classes => common}/simple_app.cc (100%) rename {macos/Classes => common}/simple_app.h (100%) rename {macos/Classes => common}/simple_handler.cc (100%) rename {macos/Classes => common}/simple_handler.h (100%) create mode 100644 macos/Classes/cef_bridge.cc diff --git a/macos/Classes/simple_app.cc b/common/simple_app.cc similarity index 100% rename from macos/Classes/simple_app.cc rename to common/simple_app.cc diff --git a/macos/Classes/simple_app.h b/common/simple_app.h similarity index 100% rename from macos/Classes/simple_app.h rename to common/simple_app.h diff --git a/macos/Classes/simple_handler.cc b/common/simple_handler.cc similarity index 100% rename from macos/Classes/simple_handler.cc rename to common/simple_handler.cc diff --git a/macos/Classes/simple_handler.h b/common/simple_handler.h similarity index 100% rename from macos/Classes/simple_handler.h rename to common/simple_handler.h diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index dcd8845..8ce359b 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -15,7 +15,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 - webview_cef: 1c58878c88cb921c6060d6df87d9fe26990a16a2 + webview_cef: 60cb104c4f5d7454500fa260cfbaeb1da3d45292 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c diff --git a/lib/src/webview.dart b/lib/src/webview.dart index 0e2ba3c..100e796 100644 --- a/lib/src/webview.dart +++ b/lib/src/webview.dart @@ -161,6 +161,9 @@ class WebviewState extends State { -signal.scrollDelta.dy.round()); } }, + onPointerPanZoomUpdate: (event) { + print(event.panDelta); + }, child: Texture(textureId: _controller._textureId), ))); } diff --git a/macos/Classes/CefWrapper.mm b/macos/Classes/CefWrapper.mm index 783fc44..e03258e 100644 --- a/macos/Classes/CefWrapper.mm +++ b/macos/Classes/CefWrapper.mm @@ -9,7 +9,8 @@ #import #import "include/wrapper/cef_library_loader.h" #import "include/cef_app.h" -#import "simple_app.h" +#import "../../common/simple_app.h" +#import "../../common/simple_handler.h" #include diff --git a/macos/Classes/cef_bridge.cc b/macos/Classes/cef_bridge.cc new file mode 100644 index 0000000..d671329 --- /dev/null +++ b/macos/Classes/cef_bridge.cc @@ -0,0 +1,8 @@ +// Relative import to be able to reuse the C sources. +#ifndef CefBridge_h +#define CefBridge_h + +#include "../../common/simple_app.cc" +#include "../../common/simple_handler.cc" + +#endif diff --git a/macos/webview_cef.podspec b/macos/webview_cef.podspec index f8c0737..6ce16c2 100644 --- a/macos/webview_cef.podspec +++ b/macos/webview_cef.podspec @@ -22,7 +22,7 @@ Flutter webview backed by CEF (Chromium Embedded Framework) $dir = File.dirname(__FILE__) $dir = $dir + "/third/cef/**" s.xcconfig = { "HEADER_SEARCH_PATHS" => $dir} - s.private_header_files = 'Classes/simple_app.h', 'Classes/simple_handler.h' + # s.private_header_files = '../common/simple_app.h', '../common/simple_handler.h' s.platform = :osx, '10.11' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }