Swipe animation working

Author: intendednull

src/animate.py

@@ -3,12 +3,14 @@
 import tkinter as tk
 import operator
 import time
-from . import widget
 from typing import NamedTuple, Callable, TypeVar, Generator, Tuple
 from enum import Enum
 from dataclasses import dataclass
 from functools import partialmethod, partial
 
+from . import widget
+from .cache import ImageTk
+
 
 class Coord(NamedTuple):
     """
@@ -235,7 +237,7 @@ def __eq__(self):
 
 
 class Window(widget.PrimaryCanvas):
-    animation_speed = 3
+    animation_speed = 4
     _current = None
 
     def init(self):
@@ -244,34 +246,41 @@ def init(self):
     def __coord(self, id):
         return Coord(*self.coords(id)[:2])
 
-    def clear(self):
-        if self._current is not None:
-            self.delete(self._current)
-            self.update()
+    def __set_image(self, view: ImageTk.PhotoImage, coord: Coord):
+        return self.create_image(
+            coord, image=view, anchor='nw'
+        )
 
-    def __set(self, view: tk.Widget, coord: Coord):
+    def __set_widget(self, view: tk.Widget, coord: Coord):
         return self.create_window(
             coord, window=view, anchor='nw'
         )
 
-    def set_view(self, view: tk.Widget):
-        self.clear()
-        self._current = self.__set(view, self.origin)
+    def __set(self, view, coord, viewtype):
+        if viewtype == 'image':
+            return self.__set_image(view, coord)
+        else:
+            return self.__set_widget(view, coord)
+
+    def set_view(self, view: tk.Widget, viewtype='image'):
+        print(self.origin)
+        self._current = self.__set(view, self.origin, viewtype)
 
-    def change_view(self, view: tk.Widget, direction: Direction):
+    def change_view(self, view: tk.Widget, direction: Direction, viewtype='image'):
         if not isinstance(direction, Direction):
             direction = Direction[direction.upper()]  # Cast string for convenience
 
         if direction in (Direction.UP, Direction.DOWN):
-            dist = self.winfo_height()
+            dist = Coord(0, self.winfo_height())
         elif direction in (Direction.LEFT, Direction.RIGHT):
-            dist = self.winfo_width()
+            dist = Coord(self.winfo_width(), 0)
         else:
             raise NotImplementedError
+
         edge = direction * dist
         end = self.origin + edge
         beg = self.origin - edge
-        wid = self.__set(view, beg)
+        wid = self.__set(view, beg, viewtype)
 
         self.animater.clear()
         self.animater.add_motion(self._current, end, speed=self.animation_speed)
@@ -282,4 +291,4 @@ def change_view(self, view: tk.Widget, direction: Direction):
 
     @property
     def origin(self):
-        return Coord(self.winfo_x(), self.winfo_y())
+        return Coord(0, 0)

src/front.py

@@ -9,6 +9,11 @@ class Front(widget.PrimaryFrame):
 
     cachesize = 10
 
+    # Quick fix to keep a reference count on the
+    # last image, making sure the garbage collector
+    # doesn't delete it before the animation ends
+    _last = None
+
     def __next(self):
         data: dict = self.cache.pop()
         data.pop('jumpscare')  # not using it for now
@@ -22,13 +27,13 @@ def __next(self):
     def __load(self, name, image, data):
         self.title.config(text=name)
         self.bio.load(data)
-
-        self.image = widget.PrimaryLabel(self.window, image=image)
+        self._last = self.image
+        self.image = image
         self.update()
 
     def __change_image(self, direction: Direction):
         self.__next()
-        self.window.change_view(self.image, direction)
+        self.window.change_view(self.image, direction, viewtype='image')
 
     def init(self):
         self.title = widget.PrimaryLabel(self)
@@ -57,6 +62,7 @@ def init(self):
 
         self._loop = asyncio.get_event_loop()
         self.cache = Cache(self.window)
+        self.cache
 
     def cmd_dislike(self):
         self.__change_image('LEFT')