Glfw mouse position fix (#241)

* Fix mouse position for macos on glfw

* new black

* pyinstaller needs jaraco, it seems

* undo add jaraco

* print pyinstaller version

* give latest pyinstaller a try

* is the ~xfail?

* Update test_wgpu.py

* discard ci xfail again

* try pyinstaller workaround

* arg wrong url

* revert pyinstaller hack

Co-authored-by: Korijn van Golen <[email protected]>

Author: almarklein

.github/workflows/ci.yml

@@ -117,7 +117,8 @@ jobs:
     - name: Test PyInstaller
       if: matrix.PYINSTALLER == 1
       run: |
-          pip install psutil pyinstaller>=4
+          pip install psutil pyinstaller>=4.9
+          pyinstaller --version
           pytest -v wgpu/__pyinstaller
 
   # The release builds are done for the platforms that we want to build wheels for.

download-wgpu-native.py

@@ -77,7 +77,7 @@ def get_os_string():
 
 def get_arch():
     # See e.g.: https://stackoverflow.com/questions/45124888
-    is_64_bit = sys.maxsize > 2 ** 32
+    is_64_bit = sys.maxsize > 2**32
     machine = platform.machine()
 
     # See if this is run by cibuildwheel and check to see if ARCHFLAGS is

wgpu/backends/rs.py

@@ -174,7 +174,7 @@ def feature_flag_to_feature_names(flag):
     feature_names = {}  # import this from mappings?
     features = []
     for i in range(32):
-        val = int(2 ** i)
+        val = int(2**i)
         if flag & val:
             features.append(feature_names.get(val, val))
     return tuple(sorted(features))

wgpu/gui/glfw.py

@@ -177,6 +177,7 @@ def __init__(self, *, size=None, title=None, **kwargs):
 
         # Initialize the size
         self._pixel_ratio = -1
+        self._screen_size_is_logical = False
         self.set_logical_size(*size)
         self._request_draw()
 
@@ -259,6 +260,7 @@ def _set_logical_size(self, new_logical_size):
                 int(new_logical_size[0] * pixel_ratio * screen_ratio),
                 int(new_logical_size[1] * pixel_ratio * screen_ratio),
             )
+        self._screen_size_is_logical = screen_ratio != 1
         # If this causes the widget size to change, then _on_size_change will
         # be called, but we may want force redetermining the size.
         if pixel_ratio != self._pixel_ratio:
@@ -415,7 +417,10 @@ def _follow_double_click(self, action, button):
 
     def _on_cursor_pos(self, window, x, y):
         # Store pointer position in logical coordinates
-        self._pointer_pos = x / self._pixel_ratio, y / self._pixel_ratio
+        if self._screen_size_is_logical:
+            self._pointer_pos = x, y
+        else:
+            self._pointer_pos = x / self._pixel_ratio, y / self._pixel_ratio
 
         ev = {
             "event_type": "pointer_move",