hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: remove conflict bitsdojo_window plugin for linux & macOS

Browse Source 
Signed-off-by: Kingtous <kingtous@qq.com>
This commit is contained in:
Kingtous 2022-06-27 10:00:51 +08:00
parent eef20806d6
commit d5c0bcea61
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/linux/my_application.cc
View File

@ -1,7 +1,7 @@
#include "my_application.h" #include "my_application.h"
#include <flutter_linux/flutter_linux.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 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif #endif
@ -48,8 +48,8 @@ static void my_application_activate(GApplication* application) {
gtk_window_set_title(window, "rustdesk"); gtk_window_set_title(window, "rustdesk");
} }
auto bdw = bitsdojo_window_from(window); // <--- add this line // auto bdw = bitsdojo_window_from(window); // <--- add this line
bdw->setCustomFrame(true); // <-- add this line // bdw->setCustomFrame(true); // <-- add this line
gtk_window_set_default_size(window, 1280, 720); // <-- comment this line gtk_window_set_default_size(window, 1280, 720); // <-- comment this line
gtk_widget_show(GTK_WIDGET(window)); gtk_widget_show(GTK_WIDGET(window));

10
flutter/macos/Runner/MainFlutterWindow.swift
View File

@ -1,8 +1,8 @@
import Cocoa import Cocoa
import FlutterMacOS import FlutterMacOS
import bitsdojo_window_macos // import bitsdojo_window_macos
class MainFlutterWindow: BitsdojoWindow { class MainFlutterWindow: NSWindow {
override func awakeFromNib() { override func awakeFromNib() {
if (!rustdesk_core_main()){ if (!rustdesk_core_main()){
print("Rustdesk core returns false, exiting without launching Flutter app") print("Rustdesk core returns false, exiting without launching Flutter app")
@ -18,7 +18,7 @@ class MainFlutterWindow: BitsdojoWindow {
super.awakeFromNib() super.awakeFromNib()
} }
override func bitsdojo_window_configure() -> UInt { // override func bitsdojo_window_configure() -> UInt {
return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP // return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
} // }
} }

2
flutter/pubspec.yaml
View File

@ -63,7 +63,7 @@ dependencies:
git: git:
url: https://github.com/Kingtous/rustdesk_desktop_multi_window url: https://github.com/Kingtous/rustdesk_desktop_multi_window
ref: c7d97cb6615f2def34f8bad4def01af9e0077beb ref: c7d97cb6615f2def34f8bad4def01af9e0077beb
bitsdojo_window: ^0.1.2 # bitsdojo_window: ^0.1.2
freezed_annotation: ^2.0.3 freezed_annotation: ^2.0.3
tray_manager: 0.1.7 tray_manager: 0.1.7
get: ^4.6.5 get: ^4.6.5