TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-10 05:21:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: desktop, remote toolbar, remember collapse (#8349)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2024-06-14 00:28:59 +08:00
committed by GitHub
parent 12f7fc3d33
commit 07e0b5ac10
4 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/desktop/pages/remote_page.dart
View File

@@ -496,6 +496,7 @@ class _RemotePageState extends State<RemotePage>
() => _ffi.ffiModel.pi.isSet.isFalse
? Container(color: Colors.transparent)
: Obx(() {
widget.toolbarState.initShow(sessionId);
_ffi.textureModel.updateCurrentDisplay(peerDisplay.value);
return ImagePaint(
id: widget.id,

14
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@@ -46,7 +46,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
static const IconData selectedIcon = Icons.desktop_windows_sharp;
static const IconData unselectedIcon = Icons.desktop_windows_outlined;
late ToolbarState _toolbarState;
String? peerId;
bool _isScreenRectSet = false;
int? _display;
@@ -54,7 +53,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
var connectionMap = RxList<Widget>.empty(growable: true);
_ConnectionTabPageState(Map<String, dynamic> params) {
_toolbarState = ToolbarState();
RemoteCountState.init();
peerId = params['id'];
final sessionId = params['session_id'];
@@ -91,7 +89,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
display: display,
displays: displays?.cast<int>(),
password: params['password'],
toolbarState: _toolbarState,
toolbarState: ToolbarState(),
tabController: tabController,
switchUuid: params['switch_uuid'],
forceRelay: params['forceRelay'],
@@ -126,7 +124,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
@override
void dispose() {
super.dispose();
_toolbarState.save();
}
@override
@@ -251,15 +248,16 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
final pi = ffi.ffiModel.pi;
final perms = ffi.ffiModel.permissions;
final sessionId = ffi.sessionId;
final toolbarState = remotePage.toolbarState;
menu.addAll([
MenuEntryButton<String>(
childBuilder: (TextStyle? style) => Obx(() => Text(
translate(
_toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
style: style,
)),
proc: () {
_toolbarState.switchShow();
toolbarState.switchShow(sessionId);
cancelFunc();
},
padding: padding,
@@ -426,8 +424,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
});
});
ConnectionTypeState.init(id);
_toolbarState.setShow(
bind.mainGetUserDefaultOption(key: kOptionCollapseToolbar) != 'Y');
tabController.add(TabInfo(
key: id,
label: id,
@@ -442,7 +438,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
display: display,
displays: displays?.cast<int>(),
password: args['password'],
toolbarState: _toolbarState,
toolbarState: ToolbarState(),
tabController: tabController,
switchUuid: switchUuid,
forceRelay: args['forceRelay'],