HMH bug: ignore wacom's tablet resolution. NOTE: This breaks high-DPI…

… devices... will remove it later:
serge-rgb · Jun 3, 2017 · 8fdcd87 · 8fdcd87
1 parent 8663ff4
commit 8fdcd87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Milton.iss b/Milton.iss
@@ -3,13 +3,13 @@
 
 [Setup]
 AppName=Milton
-AppVersion=1.4.0
+AppVersion=1.4.1
 DefaultDirName={pf}\Milton
 DefaultGroupName=Milton
 ;UninstallDisplayIcon={app}\Milton.exe
 Compression=lzma2
 SolidCompression=yes
-OutputBaseFilename=MiltonSetup_1.4.0_x64
+OutputBaseFilename=MiltonSetup_1.4.1_x64
 ;ArchitecturesAllowed=x64
 ;ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes

diff --git a/src/easytab.h b/src/easytab.h
@@ -813,6 +813,7 @@ EasyTabResult EasyTab_Load(Display* Disp, Window Win)
     else                      { return EASYTAB_X11_ERROR; }
 }
 
+
 #ifdef MILTON_EASYTAB
 EasyTabResult EasyTab_HandleEvent(XEvent* Event)
 {
@@ -909,6 +910,7 @@ EasyTabResult EasyTab_Load_Ex(HWND Window,
     EasyTab = (EasyTabInfo*)calloc(1, sizeof(EasyTabInfo)); // We want init to zero, hence calloc.
     if (!EasyTab) { return EASYTAB_MEMORY_ERROR; }
 
+
     // Load Wintab DLL and get function addresses
     {
         EasyTab->Dll = LoadLibraryA("Wintab32.dll");
@@ -1013,16 +1015,21 @@ EasyTabResult EasyTab_Load_Ex(HWND Window,
         float SysExtX          = LogContext.lcSysExtX;
         float SysExtY          = LogContext.lcSysExtY;
 
+#if 0
         if (SysExtX != 0 && SysExtY != 0)
         {
             EasyTab->ScreenAreaRatioX = (float)CoordRangeX/SysExtX;
             EasyTab->ScreenAreaRatioY = (float)CoordRangeY/SysExtY;
         }
         else
         {
-            EasyTab->ScreenAreaRatioX = 1;
-            EasyTab->ScreenAreaRatioY = 1;
+            EasyTab->ScreenAreaRatioX = 1 * scale;
+            EasyTab->ScreenAreaRatioY = 1 * scale;
         }
+#else
+        EasyTab->ScreenAreaRatioX = 1;
+        EasyTab->ScreenAreaRatioY = 1;
+#endif
 
         if (TrackingMode == EASYTAB_TRACKING_MODE_RELATIVE)
         {

diff --git a/src/milton_configuration.h b/src/milton_configuration.h
@@ -6,7 +6,7 @@
 
 #define MILTON_MAJOR_VERSION 1
 #define MILTON_MINOR_VERSION 4
-#define MILTON_MICRO_VERSION 1
+#define MILTON_MICRO_VERSION 2
 
 #define MILTON_DEBUG 1
 

diff --git a/src/platform_linux.cc b/src/platform_linux.cc
@@ -20,7 +20,7 @@ perf_counter()
     timespec tp;
     int res = clock_gettime(CLOCK_REALTIME, &tp);
 
-    // TODO: Check errno and provide more informations
+    // TODO: Check errno and provide more information
     if ( res ) {
         milton_log("Something went wrong with clock_gettime\n");
     }