fix: temporary remove collesped plugins

This commit is contained in:
kingtous
2022-06-27 09:48:35 +08:00
parent f2460c26ca
commit eef20806d6
8 changed files with 59 additions and 125 deletions

View File

@@ -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<DesktopHomePage> with TrayListener {
case "quit":
exit(0);
case "show":
windowManager.show();
// windowManager.show();
break;
default:
break;

View File

@@ -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<RemotePage>
with WindowListener, AutomaticKeepAliveClientMixin {
with AutomaticKeepAliveClientMixin {
Timer? _interval;
Timer? _timer;
bool _showBar = !isWebDesktop;
@@ -69,7 +69,7 @@ class _RemotePageState extends State<RemotePage>
_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<RemotePage>
if (!Platform.isLinux) {
Wakelock.disable();
}
WindowManager.instance.removeListener(this);
// WindowManager.instance.removeListener(this);
Get.delete<FFI>(tag: widget.id);
super.dispose();
}
@@ -286,14 +286,7 @@ class _RemotePageState extends State<RemotePage>
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));
})
],
))),

View File

@@ -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();
// },),
// ],
// );
// }
// }