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

fix cm waiting page close button

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-09-06 11:18:12 +08:00
parent 31550452c3
commit 59f82262c8
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
flutter/lib/desktop/pages/server_page.dart
View File

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/mobile/pages/chat_page.dart'; import 'package:flutter_hbb/mobile/pages/chat_page.dart';
import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_hbb/models/chat_model.dart';
@ -63,20 +64,15 @@ class _DesktopServerPageState extends State<DesktopServerPage>
border: Border.all(color: MyTheme.color(context).border!)), border: Border.all(color: MyTheme.color(context).border!)),
child: Scaffold( child: Scaffold(
backgroundColor: MyTheme.color(context).bg, backgroundColor: MyTheme.color(context).bg,
body: Overlay(initialEntries: [ body: Center(
OverlayEntry(builder: (context) { child: Column(
gFFI.dialogManager.setOverlayState(Overlay.of(context)); mainAxisAlignment: MainAxisAlignment.start,
return Center( children: [
child: Column( Expanded(child: ConnectionManager()),
mainAxisAlignment: MainAxisAlignment.start, SizedBox.fromSize(size: Size(0, 15.0)),
children: [ ],
Expanded(child: ConnectionManager()), ),
SizedBox.fromSize(size: Size(0, 15.0)), ),
],
),
);
})
]),
)))); ))));
} }
@ -111,7 +107,7 @@ class ConnectionManagerState extends State<ConnectionManager> {
return serverModel.clients.isEmpty return serverModel.clients.isEmpty
? Column( ? Column(
children: [ children: [
buildTitleBar(Offstage()), buildTitleBar(),
Expanded( Expanded(
child: Center( child: Center(
child: Text(translate("Waiting")), child: Text(translate("Waiting")),
@ -134,20 +130,27 @@ class ConnectionManagerState extends State<ConnectionManager> {
])); ]));
} }
Widget buildTitleBar(Widget middle) { Widget buildTitleBar() {
return GestureDetector( return SizedBox(
onPanDown: (d) { height: kDesktopRemoteTabBarHeight,
windowManager.startDragging();
},
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
_AppIcon(), const _AppIcon(),
Expanded(child: middle), Expanded(
child: GestureDetector(
onPanStart: (d) {
windowManager.startDragging();
},
child: Container(
color: MyTheme.color(context).bg,
),
),
),
const SizedBox( const SizedBox(
width: 4.0, width: 4.0,
), ),
_CloseButton() const _CloseButton()
], ],
), ),
); );
@ -209,15 +212,16 @@ class _CloseButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Ink( return IconButton(
child: InkWell( onPressed: () {
onTap: () { windowManager.close();
windowManager.close(); },
}, icon: const Icon(
child: Icon( IconFont.close,
Icons.close, size: 18,
size: 30, ),
)), splashColor: Colors.transparent,
hoverColor: Colors.transparent,
); );
} }
} }