92eb38
From e8d25d83463805c0f6ef623dba2ac9a276df3587 Mon Sep 17 00:00:00 2001
92eb38
From: Luke Shumaker <lukeshu@lukeshu.com>
92eb38
Date: Tue, 23 May 2017 02:16:27 -0400
92eb38
Subject: vncviewer: Fix fullscreen scrolling
92eb38
92eb38
92eb38
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
92eb38
index 47fe8f89..946b162c 100644
92eb38
--- a/vncviewer/DesktopWindow.cxx
92eb38
+++ b/vncviewer/DesktopWindow.cxx
92eb38
@@ -1120,11 +1120,6 @@ void DesktopWindow::scrollTo(int x, int y)
92eb38
   hscroll->value(x);
92eb38
   vscroll->value(y);
92eb38
 
92eb38
-  if (!hscroll->visible())
92eb38
-    x = -viewport->x();
92eb38
-  if (!vscroll->visible())
92eb38
-    y = -viewport->y();
92eb38
-
92eb38
   // Scrollbar position results in inverse movement of
92eb38
   // the viewport widget
92eb38
   x = -x;
92eb38
@@ -1189,7 +1184,7 @@ void DesktopWindow::handleEdgeScroll(void *data)
92eb38
   if ((dx == 0) && (dy == 0))
92eb38
     return;
92eb38
 
92eb38
-  self->scrollTo(self->hscroll->value() + dx, self->vscroll->value() + dy);
92eb38
+  self->scrollTo(self->hscroll->value() - dx, self->vscroll->value() - dy);
92eb38
 
92eb38
   Fl::repeat_timeout(0.1, handleEdgeScroll, data);
92eb38
 }