Splash layout

Author: intendednull

src/animate.py

@@ -146,17 +146,17 @@ def get_bounce(self):
         x1, y1, x2, y2 = self.canvas.bbox(self.id)
         bounce = Coord(0, 0)
         if x1 <= self.bound_x1:
-            print('x1', x1, self.bound_x1)
+            # print('x1', x1, self.bound_x1)
             bounce += Direction.RIGHT
-        if y1 >= self.bound_y1:
-            print('y1', y1, self.bound_y1)
-            bounce += Direction.UP
+        if y1 <= self.bound_y1:
+            # print('y1', y1, self.bound_y1)
+            bounce += Direction.DOWN
         if x2 >= self.bound_x2:
-            print('x2', x2, self.bound_x2)
+            # print('x2', x2, self.bound_x2)
             bounce += Direction.LEFT
         if y2 >= self.bound_y2:
-            print('y2', y2, self.bound_y2)
-            bounce += Direction.DOWN
+            # print('y2', y2, self.bound_y2)
+            bounce += Direction.UP
         return bounce
 
     @property

src/splash.py

@@ -5,60 +5,82 @@
 from . import widget, DOCS
 
 
-class Question(widget.PrimaryFrame):
+class Splash(widget.PrimaryFrame):
 
-    def init(self):
-        self.title = widget.PrimaryLabel(self)
-        self.choices = widget.SecondaryFrame(self)
+    with (DOCS / 'questions.json').open() as fp:
+        questions = json.load(fp)
 
-        self.options = []
+    def init(self):
+        self.intro = Intro(self)
+        self.intro.pack(fill='both', expand=True)
 
-    def load(self, choices):
-        for question in questions:
-            frame = widget.SecondaryFrame(self.choices)
-            check = widget.PrimaryCheckbutton(frame)
-            val = widget.SecondaryLabel(frame, text=question)
+        self.btn_confirm = widget.PrimaryButton(self.intro.window, command=self.next, text='Okay')
+        bouncer = View(self.intro.window, window=self.btn_confirm)
 
-            frame.pack()
-            check.pack(side='left')
-            val.pack(side='left')
+        self.bounce(bouncer)
 
-        self.title.pack(fill='both', expand=True)
-        self.choices.pack(fill='both', expand=True)
+    def bounce(self, view):
+        start = view.master.center + (Direction.LEFT * 175) + (Direction.DOWN * 100)
+        wid = view.master.set_view(view, start)
+        motion = BounceBall(view.master, wid, view.master.origin, speed=6)
+        motion.kick(Direction.UP)
+        self.after(0, view.master.run, motion)
 
+    def next(self):
+        pass
 
-class Splash(widget.PrimaryFrame):
 
+class Intro(widget.PrimaryFrame):
     intro = (DOCS / 'intro.txt').read_text()
-    with (DOCS / 'questions.json').open() as fp:
-        questions = json.load(fp)
 
     def init(self):
         self.window = Window(self, bg='gray')
-        self.title = widget.PrimaryLabel(
-            self, text=self.master.master.title(),
-            font=('Courier', 17), wraplength=300
+        self.window.pack(fill='both', expand=True)
+        self.update()
+
+        width = self.winfo_reqwidth()
+        self.title = View(
+            self.window,
+            text=self.master.master.master.title(),  # yikes
+            font=('Courier', 17),
+            width=width, justify='center'
         )
         self.intro = View(
             self.window,
             text=self.intro,
-            width=self.window.winfo_reqwidth(),
+            width=width,
             font=('sys', 12), justify='center'
         )
-        self.window.set_view(self.intro)
+        self.update()
 
-        self.btn_confirm = widget.PrimaryButton(self.window, command=self.begin, text='Okay')
+        self.after(0, self.build)
 
-        self.title.pack(fill='both')
-        self.window.pack(fill='both')
-        self.bounce()
+    def build(self):
+        self.window.set_view(self.title)
+        adjust = (Direction.LEFT * 175) + (Direction.DOWN * 100)
+        self.window.set_view(
+            self.intro,
+            self.window.center + adjust
+        )
 
-    def bounce(self):
-        bouncer = View(self.window, window=self.btn_confirm)
-        wid = self.window.set_view(bouncer, self.window.center)
-        motion = BounceBall(self.window, wid, self.window.origin, speed=6)
-        motion.kick(Direction.DOWN)
-        self.after(0, self.window.run, motion)
 
-    def begin(self):
-        pass
+class Question(widget.PrimaryFrame):
+
+    def init(self):
+        self.title = widget.PrimaryLabel(self)
+        self.choices = widget.SecondaryFrame(self)
+
+        self.options = []
+
+    def load(self, choices):
+        for question in questions:
+            frame = widget.SecondaryFrame(self.choices)
+            check = widget.PrimaryCheckbutton(frame)
+            val = widget.SecondaryLabel(frame, text=question)
+
+            frame.pack()
+            check.pack(side='left')
+            val.pack(side='left')
+
+        self.title.pack(fill='both', expand=True)
+        self.choices.pack(fill='both', expand=True)

src/view.py

@@ -17,14 +17,14 @@ def init(self):
     def __coord(self, id):
         return Coord(*self.coords(id))
 
-    def __set(self, view: View, coord: Coord):
-        wid = view.draw(coord, anchor='nw')
+    def __set(self, view: View, end: Coord):
+        wid = view.draw(end, anchor='nw')
         self.current = view
         self.views[view] = wid
         return wid
 
-    def set_view(self, view: View, coord: Coord = None):
-        return self.__set(view, coord or self.origin)
+    def set_view(self, view: View, end: Coord = None):
+        return self.__set(view, end or self.origin)
 
     def move_view(self, view: View, end: Coord):
         wid = self.views.get(view)
@@ -33,11 +33,11 @@ def move_view(self, view: View, end: Coord):
                 wid, end, speed=self.animation_speed
             )
 
-    def move_in(self, view: View, direction: Direction):
+    def move_in(self, view: View, direction: Direction, end: Coord = None):
         distance = self.get_distance(direction)
         start = self.origin + distance
         wid = self.__set(view, start)
-        self.move_view(view, self.origin)
+        self.move_view(view, end or self.origin)
         return wid
 
     def move_out(self, view: View, direction: Direction):
@@ -82,10 +82,19 @@ def active(self):
     def origin(self):
         return Coord(self.canvasx(0), self.canvasy(0))
 
+    @property
+    def centery(self):
+        self.update()
+        return self.origin.midpoint(Coord(0, self.winfo_reqheight()))
+
+    @property
+    def centerx(self):
+        self.update()
+        return self.origin.midpoint(Coord(self.winfo_reqwidth(), 0))
+
     @property
     def center(self):
-        br = self.origin + Coord(self.winfo_reqwidth(), self.winfo_reqheight())
-        return self.origin.midpoint(br)
+        return self.centerx + self.centery
 
 
 class DrawType(Enum):