From ff009bc58f0008e34c40d0a7859810399b5a7c4f Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 3 Jun 2019 11:54:13 +0100
Subject: [PATCH] =?UTF-8?q?Remove=20=E2=80=98X=20Double-scroll=E2=80=99=20?=
=?UTF-8?q?workaround?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove this since it’s causing some other issues, let’s see if it
really still an issue on different platforms.
---
src/Viewer/FGEventHandler.cxx | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/Viewer/FGEventHandler.cxx b/src/Viewer/FGEventHandler.cxx
index 866e91d62..652f005ea 100644
--- a/src/Viewer/FGEventHandler.cxx
+++ b/src/Viewer/FGEventHandler.cxx
@@ -14,10 +14,6 @@
#include "WindowSystemAdapter.hxx"
#include "renderer.hxx"
-#if !defined(X_DISPLAY_MISSING)
-#define X_DOUBLE_SCROLL_BUG 1
-#endif
-
#ifdef SG_MAC
// hack - during interactive resize on Mac, OSG queues and then flushes
// a large number of resize events, without doing any drawing.
@@ -174,11 +170,7 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea,
case osgGA::GUIEventAdapter::SCROLL:
{
bool mainWindow = eventToViewport(ea, us, x, y);
-#ifdef X_DOUBLE_SCROLL_BUG
- scrollButtonPressed = !scrollButtonPressed;
- if (!scrollButtonPressed) // Drop the button release event
- return true;
-#endif
+
int button;
if (ea.getScrollingMotion() == osgGA::GUIEventAdapter::SCROLL_2D) {
if (ea.getScrollingDeltaY() > 0)