easycoder 250106.14__tar.gz → 250107.1__tar.gz

{easycoder-250106.14 → easycoder-250107.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250106.14
+Version: 250107.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250106.14 → easycoder-250107.1}/easycoder/__init__.py

@@ -10,4 +10,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250106.14"
+__version__ = "250107.1"

{easycoder-250106.14 → easycoder-250107.1}/easycoder/ec_renderer.py

@@ -9,8 +9,26 @@ from kivy.clock import Clock
 from kivy.vector import Vector
 import math
 
-class Object():
-    pass
+# Get a real position or size value
+# These are {n}w/h, where w/h are percentages
+# e.g. 25w or 50h
+def getReal(spec, val):
+    if isinstance(val, str):
+        c = val[-1]
+        if c in ['w', 'h']:
+            val = int(val[0:len(val)-1])
+            if spec.parent == None:
+                if c == 'w':
+                    n = Window.width
+                else:
+                    n = Window.height
+            else:
+                if c == 'w':
+                    n = spec.parent.realsize[0]
+                else:
+                    n = spec.parent.realsize[1]
+            return val * n / 100
+    return val
 
 class Element():
 
@@ -18,43 +36,37 @@ class Element():
         self.type = type
         self.spec = spec
 
+    def getRelativePosition(self):
+        spec = self.spec
+        x = getReal(spec, spec.pos[0])
+        y = getReal(spec, spec.pos[1])
+        return Vector(x, y)
+
     def getType(self):
         return self.spec.type
 
     def getID(self):
         return self.spec.id
 
-    def getRealPos(self):
-        spec = self.spec
-        pos = spec.realpos
-        if spec.parent != None:
-            pos = Vector(pos) + spec.parent.realpos
-        return pos
-
     def getPos(self):
         spec = self.spec
-        pos = spec.pos
+        pos = spec.realpos
         if spec.parent != None:
-            pos = Vector(pos) + spec.parent.pos
+            pos = self.getRelativePosition() + spec.parent.realpos
         return pos
 
     def setPos(self, pos):
+        # Update the spec
         self.spec.realpos = pos
+        # Update the displayed item
         self.spec.item.pos = pos
 
-    # Called when the parent moves
-    def repos(self):
-        spec = self.spec
-        spec.item.pos = Vector(spec.realpos) + spec.parent.realpos
-
-    def getRealSize(self):
-        return self.spec.realsize
-
     def getSize(self):
-        return self.spec.size
+        return self.spec.realsize
 
     def setSize(self, size):
-        self.spec.size = size
+        self.spec.realsize = size
+        self.spec.item.size = size
 
     def getChildren(self):
         return self.spec.children
@@ -78,25 +90,6 @@ class UI(Widget):
         self.zlist.append(element)
 
     def createElement(self, spec):
-        # Get a real position or size value
-        def getReal(val):
-            if isinstance(val, str):
-                c = val[-1]
-                if c in ['w', 'h']:
-                    val = int(val[0:len(val)-1])
-                    if spec.parent == None:
-                        if c == 'w':
-                            n = Window.width
-                        else:
-                            n = Window.height
-                    else:
-                        if c == 'w':
-                            n = spec.parent.realsize[0]
-                        else:
-                            n = spec.parent.realsize[1]
-                    return val * n / 100
-            return val
-
         with self.canvas:
             if hasattr(spec, 'fill'):
                 c = spec.fill
@@ -105,9 +98,9 @@ class UI(Widget):
                     Color(c[0], c[1], c[2])
                 else:
                     Color(c[0]/255, c[1]/255, c[2]/255)
-            pos = (getReal(spec.pos[0]), getReal(spec.pos[1]))
+            pos = (getReal(spec, spec.pos[0]), getReal(spec, spec.pos[1]))
             spec.realpos = pos
-            size = (getReal(spec.size[0]), getReal(spec.size[1]))
+            size = (getReal(spec, spec.size[0]), getReal(spec, spec.size[1]))
             spec.realsize = size
             if spec.parent != None:
                 pos = Vector(pos) + spec.parent.realpos
@@ -137,15 +130,15 @@ class UI(Widget):
     def moveElementBy(self, id, dist):
         element = self.getElement(id)
         if element != None:
-            element.setPos(Vector(element.getRealPos()) + dist)
+            element.setPos(Vector(element.getPos()) + dist)
             for id in element.getChildren():
-                self.getElement(id).repos()
+                self.moveElementBy(id, dist)
         return
 
     def moveElementTo(self, id, pos):
         element = self.getElement(id)
         if element != None:
-            self.moveElementBy(id, Vector(pos) - element.getRealPos())
+            self.moveElementBy(id, Vector(pos) - element.getPos())
         return
 
     def on_touch_down(self, touch):
@@ -156,9 +149,9 @@ class UI(Widget):
             if element.cb != None:
                 spec = element.spec
                 pos = spec.realpos
-                if spec.parent != None:
-                    pos = Vector(pos) + spec.parent.realpos
-                size = spec.size
+                # if spec.parent != None:
+                #     pos = Vector(pos) + spec.parent.spec.getPos()
+                size = element.getSize()
                 if spec.type == 'ellipse':
                     a = int(size[0])/2
                     b = int(size[1])/2
@@ -250,3 +243,6 @@ class Renderer(App):
             Window.size = spec.size
             Window.left = spec.pos[0]
             Window.top = spec.pos[1]
+
+class Object():
+    pass