Merge branch 'master' of https://github.com/rustdesk/rustdesk

flutter/lib/desktop/pages/connection_page.dart

@@ -6,7 +6,6 @@ import 'dart:io';
 
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hbb/common/widgets/address_book.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
 import 'package:get/get.dart';
@@ -16,7 +15,6 @@ import 'package:window_manager/window_manager.dart';
 import '../../common.dart';
 import '../../common/formatter/id_formatter.dart';
 import '../../common/widgets/peer_tab_page.dart';
-import '../../common/widgets/peers_view.dart';
 import '../../models/platform_model.dart';
 import '../widgets/button.dart';
 
@@ -172,6 +170,7 @@ class _ConnectionPageState extends State<ConnectionPage>
                 Expanded(
                   child: Obx(
                     () => TextField(
+                      maxLength: 90,
                       autocorrect: false,
                       enableSuggestions: false,
                       keyboardType: TextInputType.visiblePassword,
@@ -179,12 +178,13 @@ class _ConnectionPageState extends State<ConnectionPage>
                       style: const TextStyle(
                         fontFamily: 'WorkSans',
                         fontSize: 22,
-                        height: 1,
+                        height: 1.25,
                       ),
                       maxLines: 1,
                       cursorColor:
                           Theme.of(context).textTheme.titleLarge?.color,
                       decoration: InputDecoration(
+                          counterText: '',
                           hintText: _idInputFocused.value
                               ? null
                               : translate('Enter Remote ID'),

flutter/lib/desktop/pages/desktop_home_page.dart

@@ -42,6 +42,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
   var svcStopped = false.obs;
   var watchIsCanScreenRecording = false;
   var watchIsProcessTrust = false;
+  var watchIsInputMonitoring = false;
   Timer? _updateTimer;
 
   @override
@@ -334,6 +335,12 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           bind.mainIsProcessTrusted(prompt: true);
           watchIsProcessTrust = true;
         }, help: 'Help', link: translate("doc_mac_permission"));
+      } else if (!bind.mainIsCanInputMonitoring(prompt: false)) {
+        return buildInstallCard("Permissions", "config_input", "Configure",
+            () async {
+          bind.mainIsCanInputMonitoring(prompt: true);
+          watchIsInputMonitoring = true;
+        }, help: 'Help', link: translate("doc_mac_permission"));
       } else if (!svcStopped.value &&
           bind.mainIsInstalled() &&
           !bind.mainIsInstalledDaemon(prompt: false)) {
@@ -467,6 +474,12 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           setState(() {});
         }
       }
+      if (watchIsInputMonitoring) {
+        if (bind.mainIsCanInputMonitoring(prompt: false)) {
+          watchIsInputMonitoring = false;
+          setState(() {});
+        }
+      }
     });
     Get.put<RxBool>(svcStopped, tag: 'stop-service');
     rustDeskWinManager.registerActiveWindowListener(onActiveWindowChanged);
@@ -500,9 +513,9 @@ class _DesktopHomePageState extends State<DesktopHomePage>
       } else if (call.method == kWindowActionRebuild) {
         reloadCurrentWindow();
       } else if (call.method == kWindowEventShow) {
-        rustDeskWinManager.registerActiveWindow(call.arguments["id"]);
+        await rustDeskWinManager.registerActiveWindow(call.arguments["id"]);
       } else if (call.method == kWindowEventHide) {
-        rustDeskWinManager.unregisterActiveWindow(call.arguments["id"]);
+        await rustDeskWinManager.unregisterActiveWindow(call.arguments["id"]);
       } else if (call.method == kWindowConnect) {
         await connectMainDesktop(
           call.arguments['id'],

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -274,6 +274,15 @@ class _GeneralState extends State<_General> {
       _OptionCheckBox(context, 'Confirm before closing multiple tabs',
           'enable-confirm-closing-tabs'),
       _OptionCheckBox(context, 'Adaptive Bitrate', 'enable-abr'),
+      if (Platform.isLinux)
+        Tooltip(
+          message: translate('software_render_tip'),
+          child: _OptionCheckBox(
+            context,
+            "Always use software rendering",
+            'allow-always-software-render',
+          ),
+        )
     ]);
   }
 
@@ -1223,7 +1232,7 @@ Widget _OptionCheckBox(BuildContext context, String label, String key,
             ref.value = option;
             if (reverse) option = !option;
             String value = bool2option(key, option);
-            bind.mainSetOption(key: key, value: value);
+            await bind.mainSetOption(key: key, value: value);
             update?.call();
           }
         }

flutter/lib/desktop/pages/remote_page.dart

@@ -402,35 +402,36 @@ class _ImagePaintState extends State<ImagePaint> {
         onHover: (evt) {},
         child: child));
 
-    if (c.scrollStyle == ScrollStyle.scrollbar) {
+    if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) {
       final imageWidth = c.getDisplayWidth() * s;
       final imageHeight = c.getDisplayHeight() * s;
+      final imageSize = Size(imageWidth, imageHeight);
       final imageWidget = CustomPaint(
-        size: Size(imageWidth, imageHeight),
+        size: imageSize,
         painter: ImagePainter(image: m.image, x: 0, y: 0, scale: s),
       );
 
       return NotificationListener<ScrollNotification>(
-        onNotification: (notification) {
-          final percentX = _horizontal.hasClients
-              ? _horizontal.position.extentBefore /
-                  (_horizontal.position.extentBefore +
-                      _horizontal.position.extentInside +
-                      _horizontal.position.extentAfter)
-              : 0.0;
-          final percentY = _vertical.hasClients
-              ? _vertical.position.extentBefore /
-                  (_vertical.position.extentBefore +
-                      _vertical.position.extentInside +
-                      _vertical.position.extentAfter)
-              : 0.0;
-          c.setScrollPercent(percentX, percentY);
-          return false;
-        },
-        child: mouseRegion(
-            child: _buildCrossScrollbar(context, _buildListener(imageWidget),
-                Size(imageWidth, imageHeight))),
-      );
+          onNotification: (notification) {
+            final percentX = _horizontal.hasClients
+                ? _horizontal.position.extentBefore /
+                    (_horizontal.position.extentBefore +
+                        _horizontal.position.extentInside +
+                        _horizontal.position.extentAfter)
+                : 0.0;
+            final percentY = _vertical.hasClients
+                ? _vertical.position.extentBefore /
+                    (_vertical.position.extentBefore +
+                        _vertical.position.extentInside +
+                        _vertical.position.extentAfter)
+                : 0.0;
+            c.setScrollPercent(percentX, percentY);
+            return false;
+          },
+          child: mouseRegion(
+            child: Obx(() => _buildCrossScrollbarFromLayout(
+                context, _buildListener(imageWidget), c.size, imageSize)),
+          ));
     } else {
       final imageWidget = CustomPaint(
         size: Size(c.size.width, c.size.height),
@@ -565,24 +566,6 @@ class _ImagePaintState extends State<ImagePaint> {
     return widget;
   }
 
-  Widget _buildCrossScrollbar(BuildContext context, Widget child, Size size) {
-    var layoutSize = MediaQuery.of(context).size;
-    // If minimized, w or h may be negative here.
-    final w = layoutSize.width - kWindowBorderWidth * 2;
-    final h =
-        layoutSize.height - kWindowBorderWidth * 2 - kDesktopRemoteTabBarHeight;
-    layoutSize = Size(
-      w < 0 ? 0 : w,
-      h < 0 ? 0 : h,
-    );
-    bool overflow =
-        layoutSize.width < size.width || layoutSize.height < size.height;
-    return overflow
-        ? Obx(() =>
-            _buildCrossScrollbarFromLayout(context, child, layoutSize, size))
-        : _buildCrossScrollbarFromLayout(context, child, layoutSize, size);
-  }
-
   Widget _buildListener(Widget child) {
     if (listenerBuilder != null) {
       return listenerBuilder!(child);