Broken

Author: intendednull

src/animate.py

@@ -36,8 +36,11 @@ def run(self):
             try:
                 move = next(motion)
                 move()
+                self.canvas.update()
             except StopIteration:
                 self._motions.remove(motion)
+        self.canvas.update()
+        # self.canvas.after(10, self.run)
 
     def add(self, motion: Motion):
         self._motions.add(motion.start())
@@ -79,6 +82,7 @@ def start(self) -> Generator[Callable]:
         """
         self.reset()
         while self.current != self.end:
+            print(self.current, self.end)
             yield self.move
 
     def reset(self):
@@ -135,14 +139,12 @@ def kick(self, direction: Point):
 
     @property
     def increment(self):
-        self.canvas.update()
         bounce = self.get_bounce()
         if bounce != Coord(0, 0):
             self.kick(bounce)
         return self.future - self.current
 
     def get_bounce(self):
-        self.canvas.update()
         x1, y1, x2, y2 = self.canvas.bbox(self.id)
         bounce = Coord(0, 0)
         if x1 <= self.bound_x1:
@@ -169,12 +171,10 @@ def bound_y1(self):
 
     @property
     def bound_x2(self):
-        # self.canvas.update()
         return self.bound_x1 + self.canvas.winfo_width()
 
     @property
     def bound_y2(self):
-        # self.canvas.update()
         return self.bound_y1 + self.canvas.winfo_height()
 
 

src/front.py

@@ -30,8 +30,8 @@ def __next(self, direction: Direction = None):
             data: dict = self.cache.next()
             image = process_image(
                 data.pop('image'),
-                self.window.winfo_width(),
-                self.window.winfo_height()
+                self.window.winfo_reqwidth(),
+                self.window.winfo_reqheight()
             )
             name = data.pop('name')
             self.__load(name, image, data)
@@ -56,6 +56,7 @@ def __load(self, name, image, data):
         self.update()
 
     def init(self):
+        self.update()
         self.title = widget.PrimaryLabel(self)
         self.window = Window(self)
         self.commandbar = widget.SecondaryFrame(self)
@@ -75,7 +76,6 @@ def init(self):
         )
         self.update()
 
-    def build(self):
         self.title.pack(fill='x', expand=True)
         self.window.pack(fill='both', expand=True)
         self.commandbar.pack(side='bottom', fill='both', expand=True)

src/main.py

@@ -21,46 +21,36 @@ def __init__(self, *args, **kwds):
         for name, val in parser['APP'].items():
             getattr(self, name)(val)
 
-        self.window = Window(self)
-        self.window.pack(expand=True, fill='both')
+        #self.window = Window(self)
+        #self.window.pack(expand=True, fill='both')
+        #elf.update()
+
+        # self.splash = Splash(self)
+        self.front = Front(self)
+        self.front.pack(fill='both', expand=True)
+        # self.execution_order = iter((
+        #     # self.splash,
+        #     self.front,
+        #     # self.result
+        # ))
         self.update()
 
-        self.splash = View(
-            self.window,
-            window=Splash(self.window),
-            height=self.winfo_height(),
-            width=self.winfo_width()
-        )
-        self.front = View(
-            self.window,
-            window=Front(self.window),
-            height=self.winfo_height(),
-            width=self.winfo_width()
-        )
-        self.execution_order = iter((
-            self.splash,
-            self.front,
-            # self.result
-        ))
-        self.update()
-        self.current: View = None
-        self.after(0, self.switch)
-
     def switch(self):
         try:
             self.update()
             if self.current is not None:
                 self.current.data.cleanup()
+                self.current.data.pack_forget()
+                self.current.data.destroy()
             self.current = next(self.execution_order)
             self.build(self.current)
         except StopIteration:
             self.cleanup()
 
     def build(self, view):
-        self.update()
-        view.master.change_view(view, 'up')
         self.update()
         view.data.build()
+        self.window.set_view(view)
 
     def cleanup(self):
         with suppress(Exception):

src/view.py

@@ -56,7 +56,8 @@ def change_view(self, view: View, direction: Direction = None):
         last = self.current
 
         self.move_in(self.current, direction.flip())
-        self.move_out(last, direction)
+        # self.move_out(last, direction)
+
         self.animater.start()
 
     def get_distance(self, direction: Direction):

src/widget.py

@@ -88,7 +88,7 @@ class PrimaryCanvas(tk.Canvas):
     DEFAULT = {
         'bg': 'gray'
     }
-
+    
     def __init__(self, *args, **kwds):
         super().__init__(*args, **{**self.DEFAULT, **kwds})
         if hasattr(self, 'init'):