From eef20806d62f2d3ac56a848697d813a7b1b31b6e Mon Sep 17 00:00:00 2001 From: kingtous Date: Mon, 27 Jun 2022 09:48:35 +0800 Subject: [PATCH] fix: temporary remove collesped plugins --- .../lib/desktop/pages/desktop_home_page.dart | 3 +- flutter/lib/desktop/pages/remote_page.dart | 17 ++-- .../lib/desktop/widgets/titlebar_widget.dart | 83 ++++++++++--------- flutter/lib/main.dart | 12 +-- flutter/lib/models/model.dart | 4 +- flutter/pubspec.lock | 57 +------------ flutter/pubspec.yaml | 4 +- flutter/windows/runner/main.cpp | 4 +- 8 files changed, 59 insertions(+), 125 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart index bbd440712..1e7006628 100644 --- a/flutter/lib/desktop/pages/desktop_home_page.dart +++ b/flutter/lib/desktop/pages/desktop_home_page.dart @@ -7,7 +7,6 @@ import 'package:flutter_hbb/desktop/widgets/titlebar_widget.dart'; import 'package:flutter_hbb/models/model.dart'; import 'package:provider/provider.dart'; import 'package:tray_manager/tray_manager.dart'; -import 'package:window_manager/window_manager.dart'; class DesktopHomePage extends StatefulWidget { DesktopHomePage({Key? key}) : super(key: key); @@ -215,7 +214,7 @@ class _DesktopHomePageState extends State with TrayListener { case "quit": exit(0); case "show": - windowManager.show(); + // windowManager.show(); break; default: break; diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index f0708f909..c938732cd 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -12,7 +12,7 @@ import 'package:get/get.dart'; import 'package:get/route_manager.dart'; import 'package:provider/provider.dart'; import 'package:wakelock/wakelock.dart'; -import 'package:window_manager/window_manager.dart'; +// import 'package:window_manager/window_manager.dart'; import '../../common.dart'; import '../../mobile/widgets/dialog.dart'; @@ -32,7 +32,7 @@ class RemotePage extends StatefulWidget { } class _RemotePageState extends State - with WindowListener, AutomaticKeepAliveClientMixin { + with AutomaticKeepAliveClientMixin { Timer? _interval; Timer? _timer; bool _showBar = !isWebDesktop; @@ -69,7 +69,7 @@ class _RemotePageState extends State _physicalFocusNode.requestFocus(); ffi.ffiModel.updateEventListener(widget.id); ffi.listenToMouse(true); - WindowManager.instance.addListener(this); + // WindowManager.instance.addListener(this); } @override @@ -89,7 +89,7 @@ class _RemotePageState extends State if (!Platform.isLinux) { Wakelock.disable(); } - WindowManager.instance.removeListener(this); + // WindowManager.instance.removeListener(this); Get.delete(tag: widget.id); super.dispose(); } @@ -286,14 +286,7 @@ class _RemotePageState extends State OverlayEntry(builder: (context) { return Container( color: Colors.black, - child: isWebDesktop - ? getBodyForDesktopWithListener(keyboard) - : SafeArea( - child: Container( - color: MyTheme.canvasColor, - child: _isPhysicalMouse - ? getBodyForMobile() - : getBodyForMobileWithGesture()))); + child: getBodyForDesktopWithListener(keyboard)); }) ], ))), diff --git a/flutter/lib/desktop/widgets/titlebar_widget.dart b/flutter/lib/desktop/widgets/titlebar_widget.dart index ecb68d513..6e9b0bf6e 100644 --- a/flutter/lib/desktop/widgets/titlebar_widget.dart +++ b/flutter/lib/desktop/widgets/titlebar_widget.dart @@ -1,4 +1,3 @@ -import 'package:bitsdojo_window/bitsdojo_window.dart'; import 'package:flutter/material.dart'; const sidebarColor = Color(0xFF0C6AF6); @@ -20,47 +19,51 @@ class DesktopTitleBar extends StatelessWidget { colors: [backgroundStartColor, backgroundEndColor], stops: [0.0, 1.0]), ), - child: WindowTitleBarBox( - child: SizedBox( - child: Row( - children: [ - Expanded( - child: MoveWindow( - child: child, - )), - const WindowButtons() - ], - ), - ), + child: Row( + children: [ + Expanded( + child: child ?? Offstage(),) + // const WindowButtons() + ], ), ); } } -final buttonColors = WindowButtonColors( - iconNormal: const Color(0xFF805306), - mouseOver: const Color(0xFFF6A00C), - mouseDown: const Color(0xFF805306), - iconMouseOver: const Color(0xFF805306), - iconMouseDown: const Color(0xFFFFD500)); - -final closeButtonColors = WindowButtonColors( - mouseOver: const Color(0xFFD32F2F), - mouseDown: const Color(0xFFB71C1C), - iconNormal: const Color(0xFF805306), - iconMouseOver: Colors.white); - -class WindowButtons extends StatelessWidget { - const WindowButtons({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Row( - children: [ - MinimizeWindowButton(colors: buttonColors), - MaximizeWindowButton(colors: buttonColors), - CloseWindowButton(colors: closeButtonColors), - ], - ); - } -} +// final buttonColors = WindowButtonColors( +// iconNormal: const Color(0xFF805306), +// mouseOver: const Color(0xFFF6A00C), +// mouseDown: const Color(0xFF805306), +// iconMouseOver: const Color(0xFF805306), +// iconMouseDown: const Color(0xFFFFD500)); +// +// final closeButtonColors = WindowButtonColors( +// mouseOver: const Color(0xFFD32F2F), +// mouseDown: const Color(0xFFB71C1C), +// iconNormal: const Color(0xFF805306), +// iconMouseOver: Colors.white); +// +// class WindowButtons extends StatelessWidget { +// const WindowButtons({Key? key}) : super(key: key); +// +// @override +// Widget build(BuildContext context) { +// return Row( +// children: [ +// MinimizeWindowButton(colors: buttonColors, onPressed: () { +// windowManager.minimize(); +// },), +// MaximizeWindowButton(colors: buttonColors, onPressed: () async { +// if (await windowManager.isMaximized()) { +// windowManager.restore(); +// } else { +// windowManager.maximize(); +// } +// },), +// CloseWindowButton(colors: closeButtonColors, onPressed: () { +// windowManager.close(); +// },), +// ], +// ); +// } +// } diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart index 898274337..322d9f300 100644 --- a/flutter/lib/main.dart +++ b/flutter/lib/main.dart @@ -1,6 +1,5 @@ import 'dart:convert'; -import 'package:bitsdojo_window/bitsdojo_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart'; import 'package:flutter_hbb/desktop/screen/desktop_file_transfer_screen.dart'; @@ -9,7 +8,7 @@ import 'package:flutter_hbb/utils/multi_window_manager.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/route_manager.dart'; import 'package:provider/provider.dart'; -import 'package:window_manager/window_manager.dart'; +// import 'package:window_manager/window_manager.dart'; import 'common.dart'; import 'mobile/pages/home_page.dart'; @@ -38,7 +37,6 @@ void runRustDeskApp(List args) async { return; } // main window - await windowManager.ensureInitialized(); if (args.isNotEmpty && args.first == 'multi_window') { windowId = int.parse(args[1]); final argument = args[2].isEmpty @@ -59,17 +57,11 @@ void runRustDeskApp(List args) async { break; } } else { + // await windowManager.ensureInitialized(); // disable tray // initTray(); gFFI.serverModel.startService(); runApp(App()); - doWhenWindowReady(() { - const initialSize = Size(1280, 720); - appWindow.minSize = initialSize; - appWindow.size = initialSize; - appWindow.alignment = Alignment.center; - appWindow.show(); - }); } } diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart index 0332dc797..dbb0ce23e 100644 --- a/flutter/lib/models/model.dart +++ b/flutter/lib/models/model.dart @@ -891,9 +891,7 @@ class FFI { /// Connect with the given [id]. Only transfer file if [isFileTransfer]. void connect(String id, {bool isFileTransfer = false}) { - if (isFileTransfer) { - setByName('connect_file_transfer', id); - } else { + if (!isFileTransfer) { chatModel.resetClientMode(); canvasModel.id = id; imageModel._id = id; diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index d82f4c367..e9fb72892 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -36,41 +36,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.8.2" - bitsdojo_window: - dependency: "direct main" - description: - name: bitsdojo_window - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" - bitsdojo_window_linux: - dependency: transitive - description: - name: bitsdojo_window_linux - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" - bitsdojo_window_macos: - dependency: transitive - description: - name: bitsdojo_window_macos - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" - bitsdojo_window_platform_interface: - dependency: transitive - description: - name: bitsdojo_window_platform_interface - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" - bitsdojo_window_windows: - dependency: transitive - description: - name: bitsdojo_window_windows - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" boolean_selector: dependency: transitive description: @@ -221,11 +186,9 @@ packages: desktop_multi_window: dependency: "direct main" description: - path: "." - ref: "704718b2853723b615675e048f1f385cbfb209a6" - resolved-ref: "704718b2853723b615675e048f1f385cbfb209a6" - url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" - source: git + path: "../../rustdesk_desktop_multi_window" + relative: true + source: path version: "0.0.1" device_info_plus: dependency: "direct main" @@ -785,13 +748,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" - screen_retriever: - dependency: transitive - description: - name: screen_retriever - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.2" settings_ui: dependency: "direct main" description: @@ -1105,13 +1061,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.6.1" - window_manager: - dependency: "direct main" - description: - name: window_manager - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.2.5" xdg_directories: dependency: transitive description: diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 65bd819ff..98d858d44 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -58,11 +58,11 @@ dependencies: url: https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge ref: master path: frb_dart - window_manager: ^0.2.5 + # window_manager: ^0.2.5 desktop_multi_window: git: url: https://github.com/Kingtous/rustdesk_desktop_multi_window - ref: 704718b2853723b615675e048f1f385cbfb209a6 + ref: c7d97cb6615f2def34f8bad4def01af9e0077beb bitsdojo_window: ^0.1.2 freezed_annotation: ^2.0.3 tray_manager: 0.1.7 diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp index 4073213e5..f84fc1861 100644 --- a/flutter/windows/runner/main.cpp +++ b/flutter/windows/runner/main.cpp @@ -5,11 +5,11 @@ #include "flutter_window.h" #include "utils.h" -#include +// #include typedef bool (*FUNC_RUSTDESK_CORE_MAIN)(void); -auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP); +// auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP); int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, _In_ wchar_t *command_line, _In_ int show_command) {