mirrors/rustdesk
2
0
Fork 1
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-06-22 10:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge ca972a1bc6 into cd2fff0655

Browse source
This commit is contained in:
KLXY 2026-06-20 11:39:48 +00:00 • committed by GitHub
commit 55f3a35ce3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

64
flutter/lib/mobile/pages/remote_page.dart
View file

@ -433,11 +433,15 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
});
}
Widget _bottomWidget() => _showGestureHelp
? getGestureHelp()
: (_showBar && gFFI.ffiModel.pi.displays.isNotEmpty
? getBottomAppBar()
: Offstage());
Widget _bottomWidget() => AnimatedSize(
duration: const Duration(milliseconds: 200),
curve: Curves.easeOutCubic,
child: _showGestureHelp
? getGestureHelp()
: (_showBar && gFFI.ffiModel.pi.displays.isNotEmpty
? getBottomAppBar()
: const SizedBox(width: double.infinity, height: 0)),
);
@override
Widget build(BuildContext context) {
@ -451,6 +455,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
return false;
},
child: Scaffold(
extendBody: true,
// workaround for https://github.com/rustdesk/rustdesk/issues/3131
floatingActionButtonLocation: keyboardIsVisible
? FABLocation(FloatingActionButtonLocation.endFloat, 0, -35)
@ -480,24 +485,11 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
}
});
}),
bottomNavigationBar: Obx(() => Stack(
alignment: Alignment.bottomCenter,
children: [
gFFI.ffiModel.pi.isSet.isTrue &&
gFFI.ffiModel.waitForFirstImage.isTrue
? emptyOverlay(MyTheme.canvasColor)
: () {
gFFI.ffiModel.tryShowAndroidActionsOverlay();
return Offstage();
}(),
_bottomWidget(),
gFFI.ffiModel.pi.isSet.isFalse
? emptyOverlay(MyTheme.canvasColor)
: Offstage(),
],
)),
body: Obx(
() => getRawPointerAndKeyBody(Overlay(
() => Stack(
alignment: Alignment.bottomCenter,
children: [
getRawPointerAndKeyBody(Overlay(
initialEntries: [
OverlayEntry(builder: (context) {
return Container(
@ -530,7 +522,20 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
})
],
)),
)),
gFFI.ffiModel.pi.isSet.isTrue &&
gFFI.ffiModel.waitForFirstImage.isTrue
? emptyOverlay(MyTheme.canvasColor)
: () {
gFFI.ffiModel.tryShowAndroidActionsOverlay();
return Offstage();
}(),
_bottomWidget(),
gFFI.ffiModel.pi.isSet.isFalse
? emptyOverlay(MyTheme.canvasColor)
: Offstage(),
],
),
)),
);
}
@ -555,7 +560,9 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
return BottomAppBar(
elevation: 10,
color: MyTheme.accent,
child: Row(
child: Padding(
padding: const EdgeInsets.only(bottom: 5.0, left: 16.0, right: 16.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -646,6 +653,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
)),
],
),
),
);
}
@ -880,8 +888,10 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
/// aka changeTouchMode
BottomAppBar getGestureHelp() {
return BottomAppBar(
child: SingleChildScrollView(
controller: ScrollController(),
child: Padding(
padding: const EdgeInsets.only(bottom: 5.0, left: 16.0, right: 16.0),
child: SingleChildScrollView(
controller: ScrollController(),
padding: EdgeInsets.symmetric(vertical: 10),
child: GestureHelp(
touchMode: gFFI.ffiModel.touchMode,
@ -892,7 +902,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
},
virtualMouseMode: gFFI.ffiModel.virtualMouseMode,
inputModel: gFFI.inputModel,
)));
))));
}
// * Currently mobile does not enable map mode