Commit 25c1b2b6 authored by Jeffrey Lee's avatar Jeffrey Lee Committed by ROOL
Browse files

Adjust USBDriver scrollwheel fix

Starting with USBDriver 1.30, the scrollwheel is now handled in a
sensible manner, so there's no longer any need to ignore four out of
every five wheel events.

Version 2.36. Tagged as 'Paint-2_36'
parent ab784d97
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "2.35"
Module_Version SETA 235
Module_MajorVersion SETS "2.36"
Module_Version SETA 236
Module_MinorVersion SETS ""
Module_Date SETS "23 May 2020"
Module_ApplicationDate SETS "23-May-20"
Module_Date SETS "04 Jul 2020"
Module_ApplicationDate SETS "04-Jul-20"
Module_ComponentName SETS "Paint"
Module_FullVersion SETS "2.35"
Module_HelpVersion SETS "2.35 (23 May 2020)"
Module_FullVersion SETS "2.36"
Module_HelpVersion SETS "2.36 (04 Jul 2020)"
END
/* (2.35)
/* (2.36)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.35
#define Module_MajorVersion_CMHG 2.36
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 May 2020
#define Module_Date_CMHG 04 Jul 2020
#define Module_MajorVersion "2.35"
#define Module_Version 235
#define Module_MajorVersion "2.36"
#define Module_Version 236
#define Module_MinorVersion ""
#define Module_Date "23 May 2020"
#define Module_Date "04 Jul 2020"
#define Module_ApplicationDate "23-May-20"
#define Module_ApplicationDate "04-Jul-20"
#define Module_ComponentName "Paint"
#define Module_FullVersion "2.35"
#define Module_HelpVersion "2.35 (23 May 2020)"
#define Module_LibraryVersionInfo "2:35"
#define Module_FullVersion "2.36"
#define Module_HelpVersion "2.36 (04 Jul 2020)"
#define Module_LibraryVersionInfo "2:36"
......@@ -1154,10 +1154,11 @@ void sprwindow_event_handler (wimp_eventstr *e, void *handle)
}
}
if (eventCount == -1)
{ /* At time of writing, version 0.25 and up of the USBDriver has a "feature" that sends 5 scroll events per mouse wheel step */
{ /* Version 0.25 to 1.30 of USBDriver have a "feature" that sends 5 scroll events per mouse wheel step */
os_error *err = os_cli("RMEnsure USBDriver 0.25");
/* If no error is generated by RMEnsure, the troublesome driver is present and we do need the fix */
scrollFix = (err == NULL);
os_error *err2 = os_cli("RMEnsure USBDriver 1.30");
/* If the first doesn't error but the second does, we have a troublesome version */
scrollFix = (err == NULL) && (err2 != NULL);
eventCount = 0;
}
if (scrollFix)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment