Group cache needs to be cleared upon group change for TextLayouts. (#825

)

Caret also needs to be able to update layout in-case the group changes.

pyglet/gui/widgets.py

@@ -438,6 +438,7 @@ def _check_hit(self, x, y):
     def _set_focus(self, value):
         self._focus = value
         self._caret.visible = value
+        self._caret.layout = self._layout
 
     def update_groups(self, order):
         self._outline.group = Group(order=order + 1, parent=self._user_group)

pyglet/text/caret.py

@@ -85,8 +85,10 @@ def __init__(self, layout, batch=None, color=(0, 0, 0, 255)):
         """
         from pyglet import gl
         self._layout = layout
-        batch = batch or layout.batch
-        group = layout.foreground_decoration_group
+
+        self._custom_batch = True if batch else False
+        self._batch = batch or layout.batch
+        self._group = layout.foreground_decoration_group
 
         # Handle both 3 and 4 byte colors
         r, g, b, *a = color
@@ -96,7 +98,7 @@ def __init__(self, layout, batch=None, color=(0, 0, 0, 255)):
 
         colors = r, g, b, self._visible_alpha, r, g, b, self._visible_alpha
 
-        self._list = group.program.vertex_list(2, gl.GL_LINES, batch, group, colors=('Bn', colors))
+        self._list = self._group.program.vertex_list(2, gl.GL_LINES, batch, self._group, colors=('Bn', colors))
         self._ideal_x = None
         self._ideal_line = None
         self._next_attributes = {}
@@ -105,6 +107,21 @@ def __init__(self, layout, batch=None, color=(0, 0, 0, 255)):
 
         layout.push_handlers(self)
 
+    @property
+    def layout(self):
+        return self._layout
+
+    @layout.setter
+    def layout(self, layout):
+        if self._layout == layout and self._group == layout.group:
+            return
+
+        from pyglet import gl
+        self._layout = layout
+        batch = self._batch if self._custom_batch else layout.batch
+        self._group = layout.foreground_decoration_group
+        self._batch.migrate(self._list, gl.GL_LINES, self._group, batch)
+
     def delete(self):
         """Remove the caret from its batch.
 

pyglet/text/layout.py

@@ -958,6 +958,7 @@ def group(self):
     def group(self, group):
         self._user_group = group
         self._initialize_groups()
+        self.group_cache.clear()
         self._update()
 
     @property