From 43f70329cbf568552afb2171f4011b558e0fbddc Mon Sep 17 00:00:00 2001
From: Galygious <galygious@example.com>
Date: Mon, 16 Mar 2026 06:31:44 -0500
Subject: [PATCH] fix(flutter): respect fixed remote canvas margin

---
 flutter/lib/desktop/widgets/remote_toolbar.dart | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index 2474aab38..5e4dc677b 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -1126,6 +1126,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
       final groupValue = data['scrollStyle'] as String;
       final edgeScrollEdgeThickness = data['edgeScrollEdgeThickness'] as int;
       final remoteCanvasMargin = data['remoteCanvasMargin'] as double;
+      final isRemoteCanvasMarginFixed =
+          isOptionFixed(kOptionRemoteCanvasMargin);
 
       onChangeScrollStyle(String? value) async {
         if (value == null) return;
@@ -1145,7 +1147,7 @@ class _DisplayMenuState extends State<_DisplayMenu> {
       }
 
       onChangeRemoteCanvasMargin(double? value) async {
-        if (value == null) return;
+        if (value == null || isRemoteCanvasMarginFixed) return;
         await bind.mainSetUserDefaultOption(
             key: kOptionRemoteCanvasMargin, value: value.round().toString());
         await widget.ffi.canvasModel.updateViewStyle();
@@ -1203,7 +1205,9 @@ class _DisplayMenuState extends State<_DisplayMenu> {
                       value: remoteCanvasMargin,
                       min: 0,
                       max: 400,
-                      onChanged: onChangeRemoteCanvasMargin,
+                      onChanged: isRemoteCanvasMarginFixed
+                          ? null
+                          : onChangeRemoteCanvasMargin,
                       colorScheme: colorScheme,
                     ),
                   ),