From a6a149bf596a8dad47e9299a2d677322005ae334 Mon Sep 17 00:00:00 2001
From: Alessandro De Blasis <alex@deblasis.net>
Date: Wed, 29 Oct 2025 09:48:44 +0100
Subject: [PATCH] Revert "fix: mobile remove "Scale custom" (#13323)"

This reverts commit 265d08fc3b72c6d61f0840f0d61d13fe248230fe.
---
 flutter/lib/common/widgets/toolbar.dart       |  11 +-
 .../lib/desktop/widgets/remote_toolbar.dart   | 129 ++++++++++++++++++
 2 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart
index e65629125..b158679eb 100644
--- a/flutter/lib/common/widgets/toolbar.dart
+++ b/flutter/lib/common/widgets/toolbar.dart
@@ -364,12 +364,11 @@ Future<List<TRadioMenu<String>>> toolbarViewStyle(
         value: kRemoteViewStyleAdaptive,
         groupValue: groupValue,
         onChanged: onChanged),
-    if (isDesktop || isWebDesktop)
-      TRadioMenu<String>(
-          child: Text(translate('Scale custom')),
-          value: kRemoteViewStyleCustom,
-          groupValue: groupValue,
-          onChanged: onChanged)
+    TRadioMenu<String>(
+        child: Text(translate('Scale custom')),
+        value: kRemoteViewStyleCustom,
+        groupValue: groupValue,
+        onChanged: onChanged)
   ];
 }
 
diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index 84b741d00..1458169c4 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -153,6 +153,135 @@ class _ToolbarTheme {
 typedef DismissFunc = void Function();
 
 class RemoteMenuEntry {
+  static MenuEntryRadios<String> viewStyle(
+    String remoteId,
+    FFI ffi,
+    EdgeInsets padding, {
+    DismissFunc? dismissFunc,
+    DismissCallback? dismissCallback,
+    RxString? rxViewStyle,
+  }) {
+    return MenuEntryRadios<String>(
+      text: translate('Ratio'),
+      optionsGetter: () => [
+        MenuEntryRadioOption(
+          text: translate('Scale original'),
+          value: kRemoteViewStyleOriginal,
+          dismissOnClicked: true,
+          dismissCallback: dismissCallback,
+        ),
+        MenuEntryRadioOption(
+          text: translate('Scale adaptive'),
+          value: kRemoteViewStyleAdaptive,
+          dismissOnClicked: true,
+          dismissCallback: dismissCallback,
+        ),
+        MenuEntryRadioOption(
+          text: translate('Scale custom'),
+          value: kRemoteViewStyleCustom,
+          dismissOnClicked: true,
+          dismissCallback: dismissCallback,
+        ),
+      ],
+      curOptionGetter: () async {
+        // null means peer id is not found, which there's no need to care about
+        final viewStyle =
+            await bind.sessionGetViewStyle(sessionId: ffi.sessionId) ?? '';
+        if (rxViewStyle != null) {
+          rxViewStyle.value = viewStyle;
+        }
+        return viewStyle;
+      },
+      optionSetter: (String oldValue, String newValue) async {
+        await bind.sessionSetViewStyle(
+            sessionId: ffi.sessionId, value: newValue);
+        if (rxViewStyle != null) {
+          rxViewStyle.value = newValue;
+        }
+        ffi.canvasModel.updateViewStyle();
+        if (dismissFunc != null) {
+          dismissFunc();
+        }
+      },
+      padding: padding,
+      dismissOnClicked: true,
+      dismissCallback: dismissCallback,
+    );
+  }
+
+  static MenuEntrySwitch2<String> showRemoteCursor(
+    String remoteId,
+    SessionID sessionId,
+    EdgeInsets padding, {
+    DismissFunc? dismissFunc,
+    DismissCallback? dismissCallback,
+  }) {
+    final state = ShowRemoteCursorState.find(remoteId);
+    final optKey = 'show-remote-cursor';
+    return MenuEntrySwitch2<String>(
+      switchType: SwitchType.scheckbox,
+      text: translate('Show remote cursor'),
+      getter: () {
+        return state;
+      },
+      setter: (bool v) async {
+        await bind.sessionToggleOption(sessionId: sessionId, value: optKey);
+        state.value =
+            bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: optKey);
+        if (dismissFunc != null) {
+          dismissFunc();
+        }
+      },
+      padding: padding,
+      dismissOnClicked: true,
+      dismissCallback: dismissCallback,
+    );
+  }
+
+  static MenuEntrySwitch<String> disableClipboard(
+    SessionID sessionId,
+    EdgeInsets? padding, {
+    DismissFunc? dismissFunc,
+    DismissCallback? dismissCallback,
+  }) {
+    return createSwitchMenuEntry(
+      sessionId,
+      'Disable clipboard',
+      'disable-clipboard',
+      padding,
+      true,
+      dismissCallback: dismissCallback,
+    );
+  }
+
+  static MenuEntrySwitch<String> createSwitchMenuEntry(
+    SessionID sessionId,
+    String text,
+    String option,
+    EdgeInsets? padding,
+    bool dismissOnClicked, {
+    DismissFunc? dismissFunc,
+    DismissCallback? dismissCallback,
+  }) {
+    return MenuEntrySwitch<String>(
+      switchType: SwitchType.scheckbox,
+      text: translate(text),
+      getter: () async {
+        return bind.sessionGetToggleOptionSync(
+            sessionId: sessionId, arg: option);
+      },
+      setter: (bool v) async {
+        await bind.sessionToggleOption(sessionId: sessionId, value: option);
+        if (dismissFunc != null) {
+          dismissFunc();
+        }
+      },
+      padding: padding,
+      dismissOnClicked: dismissOnClicked,
+      dismissCallback: dismissCallback,
+    );
+  }
+
   static MenuEntryButton<String> insertLock(
     SessionID sessionId,
     EdgeInsets? padding, {