Make sure layers indices can never be skipped in pd.lua

timothyschoen · timothyschoen · commit 696d227a2067 · 2024-10-04T14:14:46.000+02:00
diff --git a/pd.lua b/pd.lua
@@ -462,44 +462,41 @@ function pd.Class:canvas_realizedollar(s)
 end
 
 function pd.Class:repaint(layer)
-  if layer == nil or layer <= 1 then
-    if type(self.paint) == "function" then
-      local g = _gfx_internal.start_paint(self._object, 1);
-      if type(self.paint) == "function" and g ~= nil then
-          self:paint(g);
-          _gfx_internal.end_paint(g, 1);
+  local paint_funcs = {}
+  if type(self.paint) == "function" then
+      table.insert(paint_funcs, self.paint)
+      -- Check for layer paint functions
+      local i = 2
+      while true do
+          local paint_layer_method = "paint_layer_" .. tostring(i)
+          if type(self[paint_layer_method]) == "function" then
+              table.insert(paint_funcs, self[paint_layer_method])
+              i = i + 1;
+          else
+              break -- Exit the loop when no more paint_layer_X methods are found
+          end
       end
-    end
   end
-  if layer == nil or layer == 0 then
-    local i = 2
-    while true do
-        local paint_layer_method = "paint_layer_" .. tostring(i)
-        if type(self[paint_layer_method]) == "function" then
-            local g = _gfx_internal.start_paint(self._object, i)
-            if g ~= nil then
-                self[paint_layer_method](self, g)
-                _gfx_internal.end_paint(g, i)
-                i = i + 1
-            else
-                break;
-            end
-
+   -- repaint all
+   if layer == nil or layer == 0 then
+    for i, paint_fn in ipairs(paint_funcs) do
+        local g = _gfx_internal.start_paint(self._object, i);
+        if type(paint_fn) == "function" and g ~= nil then
+            paint_fn(self, g);
+            _gfx_internal.end_paint(g, i);
         else
-            break -- Exit the loop when no more paint_layer_X methods are found
+            break;
         end
      end
-  end
-  if layer ~= nil and layer >= 2 then
-    local paint_layer_method = "paint_layer_" .. tostring(layer)
-        if type(self[paint_layer_method]) == "function" then
-            local g = _gfx_internal.start_paint(self._object, layer)
-             if g ~= nil then
-                self[paint_layer_method](self, g)
-                _gfx_internal.end_paint(g, layer)
-            end
+   -- repaint only chosen index
+   elseif layer <= #paint_funcs then
+        local g = _gfx_internal.start_paint(self._object, layer);
+        local paint_fn = paint_funcs[layer]
+        if type(paint_fn) == "function" and g ~= nil then
+            paint_fn(self, g);
+            _gfx_internal.end_paint(g, layer);
         end
-     end
+   end
 end
 
 function pd.Class:get_size()
