[desktop_webview_window] Improve import on Windows

Author: boyan01

packages/desktop_webview_window/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 (2021/11/25)
+
+Remove windows addition import requirements.
+
 ## 0.1.2 (2021/11/24)
 
 fix TitleBar reload do not work.

packages/desktop_webview_window/README.md

@@ -30,22 +30,7 @@ Show a webview window on your flutter deksktop application.
    
    ```
 
-2. platform Windows.
-
-  * add this include to your  `windows/runner/flutter_window.cpp`
-    ```cpp
-    #include "desktop_webview_window/desktop_webview_window_plugin.h"
-    ```
-  * append this statement to your `flutter_window.cpp` `FlutterWindow::OnCreate()` method
-    ```cpp
-    bool FlutterWindow::OnCreate() {
-      ...
-      // Add this line
-      SetFlutterViewControllerFactory(std::make_unique<WebviewWindowAdapter>());
-    }
-    ```
-
-3. launch WebViewWindow
+2. launch WebViewWindow
 
    ```dart
      final webview = await WebviewWindow.create();

packages/desktop_webview_window/example/pubspec.lock

@@ -56,7 +56,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   fake_async:
     dependency: transitive
     description:

packages/desktop_webview_window/example/windows/CMakeLists.txt

@@ -32,7 +32,7 @@ add_definitions(-DUNICODE -D_UNICODE)
 # Compilation settings that should be applied to most targets.
 function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_features(${TARGET} PUBLIC cxx_std_17)
-#  target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
+  target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
   target_compile_options(${TARGET} PRIVATE /EHsc)
   target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0")
   target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")

packages/desktop_webview_window/example/windows/runner/flutter_window.cpp

@@ -3,7 +3,6 @@
 #include <optional>
 
 #include "flutter/generated_plugin_registrant.h"
-#include "desktop_webview_window/desktop_webview_window_plugin.h"
 
 FlutterWindow::FlutterWindow(const flutter::DartProject &project)
     : project_(project) {}
@@ -27,7 +26,6 @@ bool FlutterWindow::OnCreate() {
   }
   RegisterPlugins(flutter_controller_->engine());
   SetChildContent(flutter_controller_->view()->GetNativeWindow());
-  SetFlutterViewControllerFactory(std::make_unique<WebviewWindowAdapter>());
   return true;
 }
 

packages/desktop_webview_window/pubspec.yaml

@@ -1,6 +1,6 @@
 name: desktop_webview_window
 description: Show a webview window on your flutter deksktop application.
-version: 0.1.2
+version: 0.1.3
 homepage: https://github.com/MixinNetwork/flutter-plugins/tree/main/packages/desktop_webview_window
 
 environment:

packages/desktop_webview_window/windows/CMakeLists.txt

@@ -29,7 +29,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
 target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL)
 target_include_directories(${PLUGIN_NAME} INTERFACE
         "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin)
+target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin flutter_wrapper_app)
 
 add_library(Webview2 SHARED IMPORTED GLOBAL)
 SET_PROPERTY(TARGET Webview2 PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/libs/x64/Webview2Loader.dll)

packages/desktop_webview_window/windows/flutter_view.cc

@@ -5,19 +5,11 @@
 #include <windows.h>
 #include "flutter_view.h"
 
-#include <cassert>
 #include <iostream>
 
-#include "include/desktop_webview_window/desktop_webview_window_plugin.h"
 #include "utils.h"
 #include "message_channel_plugin.h"
 
-namespace {
-
-std::unique_ptr<WebviewWindowAdapter> flutter_webview_window_adapter;
-
-}
-
 namespace webview_window {
 
 FlutterView::FlutterView(std::vector<std::string> arguments) {
@@ -26,7 +18,7 @@ FlutterView::FlutterView(std::vector<std::string> arguments) {
   project.set_dart_entrypoint_arguments(std::move(arguments));
   // The size here must match the window dimensions to avoid unnecessary surface
   // creation / destruction in the startup path.
-  flutter_controller_ = flutter_webview_window_adapter->CreateViewController(0, 0, project);
+  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(0, 0, project);
   // Ensure that basic setup of the controller was successful.
   if (!flutter_controller_->engine() || !flutter_controller_->view()) {
     std::cerr << "Failed to setup Flutter engine." << std::endl;
@@ -42,20 +34,16 @@ FlutterView::~FlutterView() {
 }
 
 std::optional<LRESULT> FlutterView::HandleTopLevelWindowProc(HWND hwnd, UINT message, WPARAM w_param, LPARAM l_param) {
-  return flutter_webview_window_adapter->HandleTopLevelWindowProc(flutter_controller_, hwnd, message, w_param, l_param);
+  return flutter_controller_->HandleTopLevelWindowProc(hwnd, message, w_param, l_param);
 }
 
 void FlutterView::ReloadSystemFonts() {
-  flutter_webview_window_adapter->ReloadSystemFonts(flutter_controller_);
+  flutter_controller_->engine()->ReloadSystemFonts();
 }
 
 void FlutterView::ForceRedraw() {
-}
 
 }
 
-void SetFlutterViewControllerFactory(std::unique_ptr<WebviewWindowAdapter> adapter) {
-  assert(adapter != nullptr);
-  assert(flutter_webview_window_adapter == nullptr);
-  flutter_webview_window_adapter = std::move(adapter);
 }
+

packages/desktop_webview_window/windows/include/desktop_webview_window/desktop_webview_window_plugin.h

@@ -23,32 +23,4 @@ FLUTTER_PLUGIN_EXPORT void DesktopWebviewWindowPluginRegisterWithRegistrar(
 }  // extern "C"
 #endif
 
-class WebviewWindowAdapter {
- public:
-  virtual std::unique_ptr<flutter::FlutterViewController> CreateViewController(
-      int width,
-      int height,
-      const flutter::DartProject &project
-  ) {
-    return std::make_unique<flutter::FlutterViewController>(width, height, project);
-  }
-
-  virtual std::optional<LRESULT> HandleTopLevelWindowProc(
-      const std::unique_ptr<flutter::FlutterViewController> &flutter_view_controller,
-      HWND hwnd,
-      UINT message,
-      WPARAM wparam,
-      LPARAM lparam
-  ) {
-    return flutter_view_controller->HandleTopLevelWindowProc(hwnd, message, wparam, lparam);
-  }
-
-  virtual void ReloadSystemFonts(const std::unique_ptr<flutter::FlutterViewController> &flutter_view_controller) {
-    flutter_view_controller->engine()->ReloadSystemFonts();
-  }
-
-};
-
-FLUTTER_PLUGIN_EXPORT void SetFlutterViewControllerFactory(std::unique_ptr<WebviewWindowAdapter> adapter);
-
 #endif  // FLUTTER_PLUGIN_WEBVIEW_WINDOW_PLUGIN_H_

packages/desktop_webview_window/windows/utils.cc

@@ -9,83 +9,6 @@
 #include <memory>
 #include <set>
 
-namespace {
-
-// https://github.com/alexmercerind/flutter_acrylic/blob/master/windows/flutter_acrylic_plugin.cpp
-// flutter_acrylic_plugin BEGIN
-
-typedef enum _WINDOWCOMPOSITIONATTRIB {
-  WCA_UNDEFINED = 0,
-  WCA_NCRENDERING_ENABLED = 1,
-  WCA_NCRENDERING_POLICY = 2,
-  WCA_TRANSITIONS_FORCEDISABLED = 3,
-  WCA_ALLOW_NCPAINT = 4,
-  WCA_CAPTION_BUTTON_BOUNDS = 5,
-  WCA_NONCLIENT_RTL_LAYOUT = 6,
-  WCA_FORCE_ICONIC_REPRESENTATION = 7,
-  WCA_EXTENDED_FRAME_BOUNDS = 8,
-  WCA_HAS_ICONIC_BITMAP = 9,
-  WCA_THEME_ATTRIBUTES = 10,
-  WCA_NCRENDERING_EXILED = 11,
-  WCA_NCADORNMENTINFO = 12,
-  WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
-  WCA_VIDEO_OVERLAY_ACTIVE = 14,
-  WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
-  WCA_DISALLOW_PEEK = 16,
-  WCA_CLOAK = 17,
-  WCA_CLOAKED = 18,
-  WCA_ACCENT_POLICY = 19,
-  WCA_FREEZE_REPRESENTATION = 20,
-  WCA_EVER_UNCLOAKED = 21,
-  WCA_VISUAL_OWNER = 22,
-  WCA_HOLOGRAPHIC = 23,
-  WCA_EXCLUDED_FROM_DDA = 24,
-  WCA_PASSIVEUPDATEMODE = 25,
-  WCA_USEDARKMODECOLORS = 26,
-  WCA_LAST = 27
-} WINDOWCOMPOSITIONATTRIB;
-
-typedef struct _WINDOWCOMPOSITIONATTRIBDATA {
-  WINDOWCOMPOSITIONATTRIB Attrib;
-  PVOID pvData;
-  SIZE_T cbData;
-} WINDOWCOMPOSITIONATTRIBDATA;
-
-typedef enum _ACCENT_STATE {
-  ACCENT_DISABLED = 0,
-  ACCENT_ENABLE_GRADIENT = 1,
-  ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
-  ACCENT_ENABLE_BLURBEHIND = 3,
-  ACCENT_ENABLE_ACRYLICBLURBEHIND = 4,
-  ACCENT_ENABLE_HOSTBACKDROP = 5,
-  ACCENT_INVALID_STATE = 6
-} ACCENT_STATE;
-
-typedef struct _ACCENT_POLICY {
-  ACCENT_STATE AccentState;
-  DWORD AccentFlags;
-  DWORD GradientColor;
-  DWORD AnimationId;
-} ACCENT_POLICY;
-
-typedef BOOL(WINAPI *GetWindowCompositionAttribute)(
-    HWND, WINDOWCOMPOSITIONATTRIBDATA *);
-typedef BOOL(WINAPI *SetWindowCompositionAttribute)(
-    HWND, WINDOWCOMPOSITIONATTRIBDATA *);
-
-typedef LONG NTSTATUS, *PNTSTATUS;
-#define STATUS_SUCCESS (0x00000000)
-
-typedef NTSTATUS(WINAPI *RtlGetVersionPtr)(PRTL_OSVERSIONINFOW);
-
-
-// flutter_acrylic_plugin END
-
-HMODULE user32 = nullptr;
-
-SetWindowCompositionAttribute set_window_composition_attribute_ = nullptr;
-
-}
 
 namespace webview_window {
 
@@ -136,30 +59,8 @@ void ClipOrCenterWindowToMonitor(HWND hwnd, UINT flags) {
 }
 
 bool SetWindowBackgroundTransparent(HWND hwnd) {
-  if (user32 == nullptr) {
-    user32 = GetModuleHandleA("user32.dll");
-    if (user32 == nullptr) {
-      return false;
-    }
-    set_window_composition_attribute_ =
-        reinterpret_cast<SetWindowCompositionAttribute>(
-            ::GetProcAddress(user32, "SetWindowCompositionAttribute"));
-    if (!set_window_composition_attribute_) {
-      return false;
-    }
-  }
-
-  ACCENT_POLICY accent = {
-      ACCENT_ENABLE_TRANSPARENTGRADIENT, 2,
-      0,
-      0};
-  WINDOWCOMPOSITIONATTRIBDATA data;
-  data.Attrib = WCA_ACCENT_POLICY;
-  data.pvData = &accent;
-  data.cbData = sizeof(accent);
-  set_window_composition_attribute_(hwnd, &data);
-
-  return true;
+  // TODO
+  return false;
 }
 
 static std::unique_ptr<std::set<LPCWSTR>> class_registered_;

packages/desktop_webview_window/windows/web_view_window_plugin.cc

@@ -58,7 +58,7 @@ void WebviewWindowPlugin::HandleMethodCall(
 
     auto window_id = next_window_id_;
     auto window = std::make_unique<WebviewWindow>(
-        method_channel_, window_id, titleBarHeight,
+        method_channel_, window_id, int(titleBarHeight),
         [this, window_id]() {
           windows_.erase(window_id);
         });