rendercanvas 3.0.0__tar.gz → 3.0.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/PKG-INFO +1 -1
  2. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/_version.py +1 -1
  3. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/base.py +7 -0
  4. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/contexts/wgpucontext.py +1 -0
  5. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/glfw.py +18 -17
  6. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/LICENSE +0 -0
  7. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/README.md +0 -0
  8. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/pyproject.toml +0 -0
  9. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/__init__.py +0 -0
  10. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/__pyinstaller/__init__.py +0 -0
  11. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/__pyinstaller/conftest.py +0 -0
  12. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/__pyinstaller/hook-rendercanvas.py +0 -0
  13. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/__pyinstaller/test_rendercanvas.py +0 -0
  14. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/anywidget.py +0 -0
  15. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/asyncio.py +0 -0
  16. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/auto.py +0 -0
  17. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/contexts/__init__.py +0 -0
  18. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/contexts/_fullscreen.py +0 -0
  19. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/contexts/basecontext.py +0 -0
  20. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/contexts/bitmapcontext.py +0 -0
  21. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/__init__.py +0 -0
  22. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/coreutils.py +0 -0
  23. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/encoders.py +0 -0
  24. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/enums.py +0 -0
  25. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/events.py +0 -0
  26. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/loop.py +0 -0
  27. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/renderview-afm.js +0 -0
  28. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/renderview-client.js +0 -0
  29. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/renderview-pyodide.js +0 -0
  30. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/renderview.css +0 -0
  31. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/renderview.js +0 -0
  32. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/scheduler.py +0 -0
  33. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/core/size.py +0 -0
  34. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/http.py +0 -0
  35. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/jupyter.py +0 -0
  36. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/offscreen.py +0 -0
  37. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/pyodide.py +0 -0
  38. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/pyqt5.py +0 -0
  39. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/pyqt6.py +0 -0
  40. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/pyside2.py +0 -0
  41. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/pyside6.py +0 -0
  42. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/qt.py +0 -0
  43. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/raw.py +0 -0
  44. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/stub.py +0 -0
  45. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/terminal.py +0 -0
  46. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/trio.py +0 -0
  47. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/utils/__init__.py +0 -0
  48. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/utils/asyncadapter.py +0 -0
  49. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/utils/asyncs.py +0 -0
  50. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/utils/cube.py +0 -0
  51. {rendercanvas-3.0.0 → rendercanvas-3.0.1}/rendercanvas/wx.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: rendercanvas
3
- Version: 3.0.0
3
+ Version: 3.0.1
4
4
  Summary: One canvas API, multiple backends
5
5
  Keywords: canvas,rendering,graphics,wgpu,qt,wx,glfw,jupyter
6
6
  Author: Almar Klein, Korijn van Golen
@@ -22,7 +22,7 @@ from pathlib import Path
22
22
 
23
23
  # This is the base version number, to be bumped before each release.
24
24
  # The build system detects this definition when building a distribution.
25
- __version__ = "3.0.0"
25
+ __version__ = "3.0.1"
26
26
 
27
27
  # Set this to your library name
28
28
  project_name = "rendercanvas"
@@ -522,6 +522,13 @@ class BaseRenderCanvas:
522
522
  # when the FPS is low on remote backends.
523
523
  self._process_events()
524
524
 
525
+ # Processing events may have closed the canvas (e.g. the user clicked the close button).
526
+ # Requesting a paint now would re-initialize the (just stopped) loop, see #267.
527
+ if self.__is_closed:
528
+ if self.__scheduler is not None:
529
+ self.__scheduler.on_cancel_draw()
530
+ return
531
+
525
532
  if self._present_to_screen:
526
533
  self._rc_request_paint() # -> _time_to_paint() -> _draw_and_present()
527
534
  else:
@@ -328,6 +328,7 @@ class WgpuContextToBitmap(WgpuContext):
328
328
  size=need_texture_size,
329
329
  format=self._config["format"],
330
330
  usage=self._config["usage"] | self._context_texture_usage,
331
+ view_formats=self._config["view_formats"],
331
332
  )
332
333
 
333
334
  return self._texture
@@ -238,8 +238,7 @@ class GlfwRenderCanvas(BaseRenderCanvas):
238
238
  self._key_modifiers = ()
239
239
  self._pointer_buttons = ()
240
240
  self._pointer_pos = 0, 0
241
- self._pointer_inside = None
242
- self._pointer_lock = False
241
+ self._pointer_inside: bool | None = None # None means locked/pending
243
242
  self._double_click_state = {"clicks": 0}
244
243
  glfw.set_mouse_button_callback(self._window, weakbind(self._on_mouse_button))
245
244
  glfw.set_cursor_pos_callback(self._window, weakbind(self._on_cursor_pos))
@@ -266,6 +265,14 @@ class GlfwRenderCanvas(BaseRenderCanvas):
266
265
  self._is_minimized = bool(iconified)
267
266
  self._set_visible(not iconified)
268
267
 
268
+ def _is_pointer_inside(self):
269
+ # If _pointer_inside is None (i.e. pending) we see if we recover it when its inside.
270
+ # Note this means we can have an enter events with no leave event. Let's look at that when we revisit events.
271
+ if self._pointer_inside is None and self._window is not None:
272
+ if glfw.get_window_attrib(self._window, glfw.HOVERED):
273
+ self._on_cursor_enter(self._window, True)
274
+ return self._pointer_inside
275
+
269
276
  def _determine_size(self):
270
277
  if self._window is None:
271
278
  return
@@ -401,6 +408,7 @@ class GlfwRenderCanvas(BaseRenderCanvas):
401
408
  self._changing_pixel_ratio = False
402
409
 
403
410
  def _on_size_change(self, *args):
411
+ self._pointer_inside = None # re-establish by explicit check
404
412
  self._determine_size()
405
413
  # During a resize, the glfw.poll_events() function blocks, so
406
414
  # our event-loop is on pause. However, glfw still sends resize
@@ -426,15 +434,12 @@ class GlfwRenderCanvas(BaseRenderCanvas):
426
434
  }
427
435
  button = button_map.get(but, 0)
428
436
 
429
- # Handler pointer locking
430
- if self._pointer_lock:
431
- if action == glfw.RELEASE:
432
- self._pointer_lock = False
433
- return
434
- elif not self._pointer_inside:
437
+ # Handle pointer locking
438
+ pointer_inside = self._is_pointer_inside()
439
+ if not pointer_inside:
435
440
  if action == glfw.PRESS:
436
441
  # This press is to select the window (regaining focus)
437
- self._pointer_lock = True
442
+ self._pointer_inside = None # means 'locked'
438
443
  return
439
444
 
440
445
  if action == glfw.PRESS:
@@ -471,7 +476,7 @@ class GlfwRenderCanvas(BaseRenderCanvas):
471
476
  # If a sequence of down-up-down-up is made in nearly the same
472
477
  # spot, and within a short time, we emit the double-click event.
473
478
 
474
- if self._pointer_lock:
479
+ if self._pointer_inside is None:
475
480
  return
476
481
 
477
482
  x, y = self._pointer_pos[0], self._pointer_pos[1]
@@ -520,16 +525,12 @@ class GlfwRenderCanvas(BaseRenderCanvas):
520
525
  self.submit_event(ev)
521
526
 
522
527
  def _on_cursor_pos(self, window, x, y):
523
- if self._pointer_lock:
528
+ pointer_inside = self._is_pointer_inside()
529
+ if pointer_inside is None:
524
530
  return
525
531
 
526
- # Maybe trigger initial enter
527
- if self._pointer_inside is None:
528
- if glfw.get_window_attrib(window, glfw.HOVERED):
529
- self._on_cursor_enter(window, True)
530
-
531
532
  # Only process move events if inside or if drag-tracking
532
- if not (self._pointer_inside or self._pointer_buttons):
533
+ if not (pointer_inside or self._pointer_buttons):
533
534
  return
534
535
 
535
536
  # Store pointer position in logical coordinates
File without changes
File without changes