Motion bug fix

Author: intendednull

src/__main__.py

@@ -1,4 +1,4 @@
-from .mainwindow import App
+from .main import App
 
 if __name__ == "__main__":
     App().mainloop()

src/animate.py

@@ -4,7 +4,7 @@
 import operator
 import time
 from . import widget
-from typing import NamedTuple, Callable, TypeVar, Generator, Tuple, Iterable
+from typing import NamedTuple, Callable, TypeVar, Generator, Tuple
 from enum import Enum
 from dataclasses import dataclass
 from functools import partialmethod, partial
@@ -145,11 +145,8 @@ def run(self):
     def add(self, motion: Motion):
         self._motions.add(iter(motion))
 
-    def add_motion(self, id: int, endpoints: Iterable[Coord], **kwargs):
-        if not isinstance(endpoints, Iterable):
-            endpoints = (endpoints,)
-
-        motion = Motion(self.canvas, id, endpoints, **kwargs)
+    def add_motion(self, id: int, end: Coord, **kwargs):
+        motion = Motion(self.canvas, id, (end,), **kwargs)
         self.add(motion)
 
     def clear(self):
@@ -257,7 +254,7 @@ def clear(self):
 
     def set_view(self, view: tk.Widget):
         self.clear()
-        self.current = self.create_window(self.origin, view)
+        self.current = self.create_window(self.origin, window=view)
 
     def change_view(self, view: tk.Widget, direction: Direction):
         if self.current is None:
@@ -277,11 +274,11 @@ def change_view(self, view: tk.Widget, direction: Direction):
         pos = self.__coord(self.current)
         end = pos + edge
         beg = pos - edge
-        wid = self.create_window(beg, view)
+        wid = self.create_window(beg, window=view)
 
         self.animater.clear()
-        self.animater.add_motion(self.current, end)
-        self.animater.add_motion(wid, self.origin)
+        self.animater.add_motion(self.current, end, speed=self.animation_speed)
+        self.animater.add_motion(wid, self.origin, speed=self.animation_speed)
 
         self.animater.start()
         self.current = wid

src/front.py

@@ -17,10 +17,7 @@ def __load(self, name, image, data):
         self.title.config(text=name)
         self.bio.load(data)
 
-        test = tk.Frame(self.window)
-        self.image = widget.PrimaryLabel(test, image=image)
-        self.image.pack()
-        self.image = test
+        self.image = widget.PrimaryLabel(self.window, image=image)
         self.update()
 
     def __change_image(self, direction: Direction):

src/widget.py

@@ -39,71 +39,55 @@ class Primary(Base):
 
 
 class SecondaryFrame(tk.Frame, Secondary):
-    __qualname__ = tk.Frame.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class SecondaryButton(tk.Button, Secondary):
-    __qualname__ = tk.Button.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class SecondaryLabel(tk.Label, Secondary):
-    __qualname__ = tk.Label.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class SecondaryCanvas(tk.Canvas, Secondary):
-    __qualname__ = tk.Canvas.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class PrimaryFrame(tk.Frame, Primary):
-    __qualname__ = tk.Frame.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class PrimaryButton(tk.Button, Primary):
-    __qualname__ = tk.Button.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class PrimaryLabel(tk.Label, Primary):
-    __qualname__ = tk.Label.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):
             self.init()
 
 
 class PrimaryCanvas(tk.Canvas, Primary):
-    __qualname__ = tk.Canvas.__qualname__
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if hasattr(self, 'init'):