pyglet 2.1.13__py3-none-any.whl → 3.0.dev1__py3-none-any.whl

pyglet/text/layout/incremental.py

@@ -17,7 +17,7 @@ from pyglet.text.layout.base import (
     _LayoutContext,
     _Line,
 )
-from pyglet.text.layout.scrolling import ScrollableTextDecorationGroup, ScrollableTextLayoutGroup
+from pyglet.text.layout import ScrollableTextLayoutGroup, ScrollableTextDecorationGroup
 
 if TYPE_CHECKING:
     from pyglet.customtypes import AnchorX, AnchorY
@@ -143,9 +143,9 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
         area = (self.left, self.bottom, self._width, self._height)
 
         for group in self.group_cache.values():
-            group.scissor_area = area
-        self.background_decoration_group.scissor_area = area
-        self.foreground_decoration_group.scissor_area = area
+            group.uniforms["scissor_area"] = area
+        self.background_decoration_group.uniforms["scissor_area"] = area
+        self.foreground_decoration_group.uniforms["scissor_area"] = area
 
     def _init_document(self) -> None:
         assert self._document, "Cannot remove document from IncrementalTextLayout"
@@ -235,7 +235,6 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
                                 self._invalid_flow.is_invalid() or
                                 self._invalid_lines.is_invalid())
 
-        len_groups = len(self.group_cache)
         # Special care if there is no text:
         if not self.glyphs:
             for line in self.lines:
@@ -261,8 +260,8 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
 
         # Update group cache areas if the count has changed. Usually if it starts with no text.
         # Group cache is only cleared in a regular TextLayout. May need revisiting if that changes.
-        if len_groups != len(self.group_cache):
-            self._update_scissor_area()
+        #if len_groups != len(self.group_cache):
+        self._update_scissor_area()
 
         if trigger_update_event:
             self.dispatch_event("on_layout_update")
@@ -305,7 +304,7 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
                 self.offsets[start] = GlyphPosition(0, 0, 0, 0)
             else:
                 text = self.document.text[start:end]
-                glyphs, offsets = font.get_glyphs(text)
+                glyphs, offsets = font.get_glyphs(text, self._shaping)
                 self.glyphs[start:end] = glyphs
                 self.offsets[start:end] = offsets
 
@@ -661,7 +660,7 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
         return self._rotation
 
     @rotation.setter
-    def rotation(self, angle: float) -> None:  # noqa: ARG002
+    def rotation(self, angle: float) -> None:
         msg = "Rotating IncrementalTextLayout's is not supported."
         raise NotImplementedError(msg)
 
@@ -939,7 +938,7 @@ class IncrementalTextLayout(TextLayout, EventDispatcher):
         if x <= self.view_x:
             self.view_x = x
 
-        elif x >= self.view_x + self.width or (x >= self.view_x + self.width) and (self._content_width > self.width):
+        elif x >= self.view_x + self.width or ((x >= self.view_x + self.width) and (self._content_width > self.width)):
             self.view_x = x - self.width
 
         elif self.view_x + self.width > self._content_width:

pyglet/text/layout/scrolling.py

@@ -2,104 +2,16 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, ClassVar
 
-from pyglet import graphics
-from pyglet.gl import (
-    GL_BLEND,
-    GL_ONE_MINUS_SRC_ALPHA,
-    GL_SRC_ALPHA,
-    GL_TEXTURE0,
-    glActiveTexture,
-    glBindTexture,
-    glBlendFunc,
-    glDisable,
-    glEnable,
-)
-from pyglet.text.layout.base import TextLayout
+from pyglet.text.layout.base import TextLayout, ScrollableTextLayoutGroup, ScrollableTextDecorationGroup
 
 if TYPE_CHECKING:
+    from pyglet.graphics.draw import Group
     from pyglet.customtypes import AnchorX, AnchorY
     from pyglet.graphics import Batch
-    from pyglet.graphics.shader import ShaderProgram
-    from pyglet.image import Texture
+    from pyglet.graphics import ShaderProgram
     from pyglet.text.document import AbstractDocument
 
 
-class ScrollableTextLayoutGroup(graphics.Group):
-    """Default rendering group for :py:class:`~pyglet.text.layout.ScrollableTextLayout`.
-
-    The group maintains internal state for specifying the viewable
-    area, and for scrolling. Because the group has internal state
-    specific to the text layout, the group is never shared.
-    """
-    scissor_area: ClassVar[tuple[int, int, int, int]] = 0, 0, 0, 0
-
-    def __init__(self, texture: Texture, program: ShaderProgram, order: int = 1,  # noqa: D107
-                 parent: graphics.Group | None = None) -> None:
-
-        super().__init__(order=order, parent=parent)
-        self.texture = texture
-        self.program = program
-
-    def set_state(self) -> None:
-        self.program.use()
-        self.program["scissor"] = True
-        self.program["scissor_area"] = self.scissor_area
-
-        glActiveTexture(GL_TEXTURE0)
-        glBindTexture(self.texture.target, self.texture.id)
-
-        glEnable(GL_BLEND)
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-
-    def unset_state(self) -> None:
-        glDisable(GL_BLEND)
-        self.program.stop()
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.texture})"
-
-    def __eq__(self, other: object) -> bool:
-        return self is other
-
-    def __hash__(self) -> int:
-        return id(self)
-
-
-class ScrollableTextDecorationGroup(graphics.Group):
-    """Create a text decoration rendering group.
-
-    The group is created internally when a :py:class:`~pyglet.text.Label`
-    is created; applications usually do not need to explicitly create it.
-    """
-
-    scissor_area: ClassVar[tuple[int, int, int, int]] = 0, 0, 0, 0
-
-    def __init__(self, program: ShaderProgram, order: int = 0, parent: graphics.Group | None = None) -> None:  # noqa: D107
-        super().__init__(order=order, parent=parent)
-        self.program = program
-
-    def set_state(self) -> None:
-        self.program.use()
-        self.program["scissor"] = True
-        self.program["scissor_area"] = self.scissor_area
-
-        glEnable(GL_BLEND)
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-
-    def unset_state(self) -> None:
-        glDisable(GL_BLEND)
-        self.program.stop()
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(scissor={self.scissor_area})"
-
-    def __eq__(self, other: object) -> bool:
-        return self is other
-
-    def __hash__(self) -> int:
-        return id(self)
-
-
 class ScrollableTextLayout(TextLayout):
     """Display text in a scrollable viewport.
 
@@ -127,7 +39,7 @@ class ScrollableTextLayout(TextLayout):
                  x: float = 0, y: float = 0, z: float = 0,
                  width: int = None, height: int = None,
                  anchor_x: AnchorX = 'left', anchor_y: AnchorY = 'bottom', rotation: float = 0, multiline: bool = False,
-                 dpi: float | None = None, batch: Batch | None = None, group: graphics.Group | None = None,
+                 dpi: float | None = None, batch: Batch | None = None, group: Group | None = None,
                  program: ShaderProgram | None = None, wrap_lines: bool = True) -> None:
 
         if width is None or height is None:
@@ -144,10 +56,10 @@ class ScrollableTextLayout(TextLayout):
         area = (self.left, self.bottom, self._width, self._height)
 
         for group in self.group_cache.values():
-            group.scissor_area = area
+            group.uniforms["scissor_area"] = area
 
-        self.background_decoration_group.scissor_area = area
-        self.foreground_decoration_group.scissor_area = area
+        self.background_decoration_group.uniforms["scissor_area"] = area
+        self.foreground_decoration_group.uniforms["scissor_area"] = area
 
     def _update(self) -> None:
         super()._update()