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