From 3f4c6a4cd189178f83284c31da6c29f03d18cd2b Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 16 Jun 2021 21:51:47 -0700
Subject: [PATCH] GUACAMOLE-724: Move mouse emulation setting from client to
 menu.

---
 .../src/app/client/controllers/clientController.js    |  8 ++++++++
 .../frontend/src/app/client/templates/client.html     |  6 +++---
 .../frontend/src/app/client/types/ClientProperties.js | 11 -----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
index 8e8318dcb..ba6225805 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -120,6 +120,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
          */
         inputMethod : preferenceService.preferences.inputMethod,
 
+        /**
+         * Whether translation of touch to mouse events should emulate an
+         * absolute pointer device, or a relative pointer device.
+         *
+         * @type Boolean
+         */
+        emulateAbsoluteMouse : preferenceService.preferences.emulateAbsoluteMouse,
+
         /**
          * The current scroll state of the menu.
          *
diff --git a/guacamole/src/main/frontend/src/app/client/templates/client.html b/guacamole/src/main/frontend/src/app/client/templates/client.html
index 4694eaff1..788e382cd 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/client.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/client.html
@@ -150,14 +150,14 @@
                 </div>
 
                 <!-- Mouse mode -->
-                <div class="menu-section" id="mouse-settings" ng-hide="client.multiTouchSupport">
+                <div class="menu-section" id="mouse-settings">
                     <h3>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h3>
                     <div class="content">
                         <p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p>
 
                         <!-- Touchscreen -->
                         <div class="choice">
-                            <input name="mouse-mode" ng-change="closeMenu()" ng-model="client.clientProperties.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute">
+                            <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute">
                             <div class="figure">
                                 <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
                                 <p class="caption"><label for="absolute">{{'CLIENT.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p>
@@ -166,7 +166,7 @@
 
                         <!-- Touchpad -->
                         <div class="choice">
-                            <input name="mouse-mode" ng-change="closeMenu()" ng-model="client.clientProperties.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative">
+                            <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative">
                             <div class="figure">
                                 <label for="relative"><img src="images/settings/touchpad.png" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
                                 <p class="caption"><label for="relative">{{'CLIENT.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p>
diff --git a/guacamole/src/main/frontend/src/app/client/types/ClientProperties.js b/guacamole/src/main/frontend/src/app/client/types/ClientProperties.js
index a138812b2..5de9689f2 100644
--- a/guacamole/src/main/frontend/src/app/client/types/ClientProperties.js
+++ b/guacamole/src/main/frontend/src/app/client/types/ClientProperties.js
@@ -22,9 +22,6 @@
  */
 angular.module('client').factory('ClientProperties', ['$injector', function defineClientProperties($injector) {
 
-    // Required services
-    var preferenceService = $injector.get('preferenceService');
-        
     /**
      * Object used for interacting with a guacClient directive.
      * 
@@ -83,14 +80,6 @@ angular.module('client').factory('ClientProperties', ['$injector', function defi
          */
         this.focused = template.focused || false;
 
-        /**
-         * Whether translation of touch to mouse events should emulate an
-         * absolute pointer device, or a relative pointer device.
-         * 
-         * @type Boolean
-         */
-        this.emulateAbsoluteMouse = template.emulateAbsoluteMouse || preferenceService.preferences.emulateAbsoluteMouse;
-
         /**
          * The relative Y coordinate of the scroll offset of the display within
          * the client element.