debug done

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-03-21 12:25:47 +08:00
parent 1d122b5a73
commit bea1eacf72
4 changed files with 12 additions and 6 deletions
flutter/lib
desktop/widgets
models
src

@ -1464,7 +1464,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
return Offstage(); return Offstage();
} }
final ffiModel = widget.ffi.ffiModel; final ffiModel = widget.ffi.ffiModel;
final visible = !widget.ffi.canvasModel.cursorEmbedded; final visible =
!widget.ffi.canvasModel.cursorEmbedded && !ffiModel.pi.is_wayland;
if (!visible) return Offstage(); if (!visible) return Offstage();
final enabled = !ffiModel.viewOnly; final enabled = !ffiModel.viewOnly;
final state = ShowRemoteCursorState.find(widget.id); final state = ShowRemoteCursorState.find(widget.id);

@ -453,9 +453,14 @@ class FfiModel with ChangeNotifier {
bind.sessionGetToggleOptionSync(id: peerId, arg: 'view-only')); bind.sessionGetToggleOptionSync(id: peerId, arg: 'view-only'));
} }
if (connType == ConnType.defaultConn) { if (connType == ConnType.defaultConn) {
try { final platform_additions = evt['platform_additions'];
_pi.platform_additions = json.decode(evt['platform_additions']); if (platform_additions != null && platform_additions != '') {
} catch (e) {} try {
_pi.platform_additions = json.decode(platform_additions);
} catch (e) {
debugPrint('Failed to decode platform_additions $e');
}
}
} }
notifyListeners(); notifyListeners();
} }

@ -509,7 +509,7 @@ impl InvokeUiSession for FlutterHandler {
("features", &features), ("features", &features),
("current_display", &pi.current_display.to_string()), ("current_display", &pi.current_display.to_string()),
("resolutions", &resolutions), ("resolutions", &resolutions),
("platform_additions": &pi.platform_additions), ("platform_additions", &pi.platform_additions),
], ],
); );
} }

@ -848,7 +848,7 @@ impl Connection {
{ {
pi.platform_additions = format!(r#" pi.platform_additions = format!(r#"
{{ {{
"is_wayland": {}, "is_wayland": {}
}} }}
"#, crate::platform::current_is_wayland()); "#, crate::platform::current_is_wayland());
} }