pxcloud/guacamole-server
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUACAMOLE-1944: Merge display margin only affects the default layer and not scrollbar layer

Browse Source
This commit is contained in:
Virtually Nick 2024-06-14 15:56:19 -04:00 committed by GitHub
commit eb9c9f3106
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/terminal/terminal.c
View File

@ -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 */