mirrors/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-05-11 10:26:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 31 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flutter/lib/desktop/widgets/remote_toolbar.dart
View file

@ -26,45 +26,42 @@ import './popup_menu.dart';
import './kb_layout_type_chooser.dart';
class ToolbarState {
late RxBool show;
late RxBool _pin;
bool isShowInited = false;
RxBool show = false.obs;
ToolbarState() {
_pin = RxBool(false);
final s = bind.getLocalFlutterOption(k: kOptionRemoteMenubarState);
if (s.isEmpty) {
_initSet(false, false);
return;
}
try {
final m = jsonDecode(s);
if (m == null) {
_initSet(false, false);
} else {
_initSet(m['pin'] ?? false, m['pin'] ?? false);
if (m != null) {
_pin = RxBool(m['pin'] ?? false);
}
} catch (e) {
debugPrint('Failed to decode toolbar state ${e.toString()}');
_initSet(false, false);
}
}
_initSet(bool s, bool p) {
// Show remubar when connection is established.
show = RxBool(
bind.mainGetUserDefaultOption(key: kOptionCollapseToolbar) != 'Y');
_pin = RxBool(p);
}
bool get pin => _pin.value;
switchShow() async {
switchShow(SessionID sessionId) async {
bind.sessionToggleOption(
sessionId: sessionId, value: kOptionCollapseToolbar);
show.value = !show.value;
}
setShow(bool v) async {
if (show.value != v) {
show.value = v;
initShow(SessionID sessionId) async {
if (!isShowInited) {
show.value = !(await bind.sessionGetToggleOption(
sessionId: sessionId, arg: kOptionCollapseToolbar) ??
false);
isShowInited = true;
}
}
@ -86,10 +83,6 @@ class ToolbarState {
bind.setLocalFlutterOption(
k: kOptionRemoteMenubarState, v: jsonEncode({'pin': _pin.value}));
}
save() async {
await _savePin();
}
}
class _ToolbarTheme {
@ -446,7 +439,7 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
sessionId: widget.ffi.sessionId,
dragging: _dragging,
fractionX: _fractionX,
show: show,
toolbarState: widget.state,
setFullscreen: _setFullscreen,
setMinimize: _minimize,
borderRadius: borderRadius,
@ -2343,7 +2336,7 @@ class _DraggableShowHide extends StatefulWidget {
final SessionID sessionId;
final RxDouble fractionX;
final RxBool dragging;
final RxBool show;
final ToolbarState toolbarState;
final BorderRadius borderRadius;
final Function(bool) setFullscreen;
@ -2354,7 +2347,7 @@ class _DraggableShowHide extends StatefulWidget {
required this.sessionId,
required this.fractionX,
required this.dragging,
required this.show,
required this.toolbarState,
required this.setFullscreen,
required this.setMinimize,
required this.borderRadius,
@ -2370,6 +2363,8 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
double left = 0.0;
double right = 1.0;
RxBool get show => widget.toolbarState.show;
@override
initState() {
super.initState();
@ -2473,13 +2468,13 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
)),
TextButton(
onPressed: () => setState(() {
widget.show.value = !widget.show.value;
widget.toolbarState.switchShow(widget.sessionId);
}),
child: Obx((() => Tooltip(
message: translate(
widget.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
message:
translate(show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
child: Icon(
widget.show.isTrue ? Icons.expand_less : Icons.expand_more,
show.isTrue ? Icons.expand_less : Icons.expand_more,
size: iconSize,
),
))),