GUACAMOLE-1944: Merge display margin only affects the default layer a…

…nd not scrollbar layer
apache · Jun 14, 2024 · eb9c9f3 · eb9c9f3
2 parents d17c427 + 917fd36
commit eb9c9f3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
@@ -1885,10 +1885,6 @@ static void guac_terminal_double_click(guac_terminal* terminal, int row, int col
 static int __guac_terminal_send_mouse(guac_terminal* term, guac_user* user,
         int x, int y, int mask) {
 
-    /* Remove display margin from mouse position without going below 0 */
-    y = y >= term->display->margin ? y - term->display->margin : 0;
-    x = x >= term->display->margin ? x - term->display->margin : 0;
-
     /* Ignore user input if terminal is not started */
     if (!term->started) {
         guac_client_log(term->client, GUAC_LOG_DEBUG, "Ignoring user input "
@@ -1918,6 +1914,10 @@ static int __guac_terminal_send_mouse(guac_terminal* term, guac_user* user,
 
     }
 
+    /* Remove display margin from mouse position without going below 0 */
+    y = y >= term->display->margin ? y - term->display->margin : 0;
+    x = x >= term->display->margin ? x - term->display->margin : 0;
+
     term->mouse_mask = mask;
 
     /* Show mouse cursor if not already shown */