Image positioning

Author: intendednull

src/animate.py

@@ -235,7 +235,7 @@ def __eq__(self):
 
 
 class Window(widget.PrimaryCanvas):
-    animation_speed = 2
+    animation_speed = 3
     _current = None
 
     def init(self):
@@ -249,25 +249,29 @@ def clear(self):
             self.delete(self._current)
             self.update()
 
+    def __set(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.create_window(self.origin, window=view)
+        self._current = self.__set(view, self.origin)
 
     def change_view(self, view: tk.Widget, direction: Direction):
         if not isinstance(direction, Direction):
             direction = Direction[direction.upper()]  # Cast string for convenience
 
         if direction in (Direction.UP, Direction.DOWN):
-            edge = self.winfo_screenheight()
+            dist = self.winfo_height()
         elif direction in (Direction.LEFT, Direction.RIGHT):
-            edge = self.winfo_screenwidth()
+            dist = self.winfo_width()
         else:
             raise NotImplementedError
-
-        pos = self.__coord(self._current)
-        end = pos + edge
-        beg = pos - edge
-        wid = self.create_window(beg, window=view)
+        edge = direction * dist
+        end = self.origin + edge
+        beg = self.origin - edge
+        wid = self.__set(view, beg)
 
         self.animater.clear()
         self.animater.add_motion(self._current, end, speed=self.animation_speed)
@@ -278,4 +282,4 @@ def change_view(self, view: tk.Widget, direction: Direction):
 
     @property
     def origin(self):
-        return Coord(0, 0)
+        return Coord(self.winfo_x(), self.winfo_y())

src/front.py

@@ -1,15 +1,21 @@
+import asyncio
+
 from . import widget
 from .animate import Window, Direction
+from .cache import Cache
 
 
 class Front(widget.PrimaryFrame):
 
-    _cache: list = None
+    cachesize = 10
 
     def __next(self):
         data: dict = self.cache.pop()
         data.pop('jumpscare')  # not using it for now
-        name = data.pop('name')
+        if 'name' in data:  # TODO Fix
+            name = data.pop('name')
+        else:
+            name = 'None'
         image = data.pop('image')
         self.__load(name, image, data)
 
@@ -49,6 +55,9 @@ def init(self):
         self.btn_dislike.pack(side='left')
         self.btn_like.pack(side='right')
 
+        self._loop = asyncio.get_event_loop()
+        self.cache = Cache(self.window)
+
     def cmd_dislike(self):
         self.__change_image('LEFT')
 
@@ -60,9 +69,9 @@ def cmd_bio(self):
 
     @property
     def cache(self):
-        if self._cache is None:
-            return AttributeError('cache has not been set.')
-        return self._cache
+        if len(self._cache.cats) < self.cachesize:
+            self._loop.run_until_complete(self._cache.refill())
+        return self._cache.cats
 
     @cache.setter
     def cache(self, data: list):

src/main.py

@@ -22,21 +22,13 @@ def __init__(self, *args, **kwds):
         self.title = title
         mixer.init()
 
-        self.loop = asyncio.get_event_loop()
-        self.cache = Cache(self)
-
         self.geometry = '400x500'
         self.minsize(400, 500)
         self.maxsize(400, 500)
 
         self.front = Front(self)
-        self.front.pack(fill='both', expand=True)
 
-        self.__cache()
-        self.front.cache = self.cache.cats
-
-    def __cache(self):
-        self.loop.run_until_complete(self.cache.refill())
+        self.front.pack(fill='both', expand=True)
 
 
 class Tinder:
@@ -62,8 +54,8 @@ def __init__(self):
         self.root = tk.Tk()
         self.root.title(self.config['main.title'])
         self.root.geometry(self.config['main.geometry'])
-        self.root.minsize(400, 500)
-        self.root.maxsize(400, 500)
+        self.root.minsize(1000, 1000)
+        self.root.maxsize(1000, 1000)
         self.root.configure(background=self.config['main.background'])
         # self.root.protocol("WM_DELETE_WINDOW", self.on_closing)
 

src/widget.py

@@ -73,7 +73,9 @@ def __init__(self, *args, **kwds):
 
 
 class PrimaryLabel(tk.Label):
-    DEFAULT = {}
+    DEFAULT = {
+        'font': ('Courier', 17)
+    }
 
     def __init__(self, *args, **kwds):
         self.DEFAULT.update(kwds)
@@ -83,7 +85,9 @@ def __init__(self, *args, **kwds):
 
 
 class PrimaryCanvas(tk.Canvas):
-    DEFAULT = {}
+    DEFAULT = {
+        'bg': 'black'
+    }
 
     def __init__(self, *args, **kwds):
         self.DEFAULT.update(kwds)