From d2f119b85e9eb7b019c78732ad030a10cd204a29 Mon Sep 17 00:00:00 2001 From: fufesou <13586388+fufesou@users.noreply.github.com> Date: Wed, 29 May 2024 12:24:33 +0800 Subject: [PATCH] fix: no forcely adaptive view style, if peer is android (#8189) Signed-off-by: fufesou --- flutter/lib/common/widgets/toolbar.dart | 2 +- flutter/lib/models/model.dart | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart index 84a03764d..7e0d32ab7 100644 --- a/flutter/lib/common/widgets/toolbar.dart +++ b/flutter/lib/common/widgets/toolbar.dart @@ -564,7 +564,7 @@ Future> toolbarDisplayToggle( child: Text(translate('Disable clipboard')))); } // lock after session end - if (ffiModel.keyboard) { + if (ffiModel.keyboard && !ffiModel.isPeerAndroid) { final enabled = !ffiModel.viewOnly; final option = 'lock-after-session-end'; final value = diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart index 4ecf36856..169635e1a 100644 --- a/flutter/lib/models/model.dart +++ b/flutter/lib/models/model.dart @@ -1220,10 +1220,6 @@ class ImageModel with ChangeNotifier { if (parent.target != null) { await initializeCursorAndCanvas(parent.target!); } - if (parent.target?.ffiModel.isPeerAndroid ?? false) { - bind.sessionSetViewStyle(sessionId: sessionId, value: 'adaptive'); - parent.target?.canvasModel.updateViewStyle(); - } } _image?.dispose(); _image = image;