From d5c0bcea61cdc2265775238a24ae50f9b145b1f1 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Mon, 27 Jun 2022 10:00:51 +0800
Subject: [PATCH] revert: remove conflict bitsdojo_window plugin for linux &
 macOS

Signed-off-by: Kingtous <kingtous@qq.com>
---
 flutter/linux/my_application.cc              |  6 +++---
 flutter/macos/Runner/MainFlutterWindow.swift | 10 +++++-----
 flutter/pubspec.yaml                         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc
index 8c7a5fe05..25e9858cc 100644
--- a/flutter/linux/my_application.cc
+++ b/flutter/linux/my_application.cc
@@ -1,7 +1,7 @@
 #include "my_application.h"
 
 #include <flutter_linux/flutter_linux.h>
-#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
+// #include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
@@ -48,8 +48,8 @@ static void my_application_activate(GApplication* application) {
     gtk_window_set_title(window, "rustdesk");
   }
 
-  auto bdw = bitsdojo_window_from(window);            // <--- add this line
-  bdw->setCustomFrame(true);                          // <-- add this line
+  // auto bdw = bitsdojo_window_from(window);            // <--- add this line
+  // bdw->setCustomFrame(true);                          // <-- add this line
   gtk_window_set_default_size(window, 1280, 720);   // <-- comment this line
   gtk_widget_show(GTK_WIDGET(window));
 
diff --git a/flutter/macos/Runner/MainFlutterWindow.swift b/flutter/macos/Runner/MainFlutterWindow.swift
index 17f024ec5..688292371 100644
--- a/flutter/macos/Runner/MainFlutterWindow.swift
+++ b/flutter/macos/Runner/MainFlutterWindow.swift
@@ -1,8 +1,8 @@
 import Cocoa
 import FlutterMacOS
-import bitsdojo_window_macos
+// import bitsdojo_window_macos
 
-class MainFlutterWindow: BitsdojoWindow {
+class MainFlutterWindow: NSWindow {
     override func awakeFromNib() {
         if (!rustdesk_core_main()){
             print("Rustdesk core returns false, exiting without launching Flutter app")
@@ -18,7 +18,7 @@ class MainFlutterWindow: BitsdojoWindow {
         super.awakeFromNib()
     }
     
-    override func bitsdojo_window_configure() -> UInt {
-        return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
-    }
+//     override func bitsdojo_window_configure() -> UInt {
+//         return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
+//     }
 }
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 98d858d44..59fcbffca 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -63,7 +63,7 @@ dependencies:
         git:
             url: https://github.com/Kingtous/rustdesk_desktop_multi_window
             ref: c7d97cb6615f2def34f8bad4def01af9e0077beb
-    bitsdojo_window: ^0.1.2
+    # bitsdojo_window: ^0.1.2
     freezed_annotation: ^2.0.3
     tray_manager: 0.1.7
     get: ^4.6.5