shortcuts remap again

katrain/gui/badukpan.py

@@ -33,11 +33,12 @@ from katrain.core.constants import (
 from katrain.core.game import Move
 from katrain.core.lang import i18n
 from katrain.core.utils import evaluation_class, format_visits, var_to_grid
-from katrain.gui.kivyutils import BackgroundMixin, draw_circle, draw_text
+from katrain.gui.kivyutils import BackgroundMixin, draw_circle, draw_text, cached_resource_find
 from katrain.gui.popups import I18NPopup, ReAnalyzeGamePopup
 from katrain.gui.style import *
 
 
+
 class BadukPanWidget(Widget):
     def __init__(self, **kwargs):
         super(BadukPanWidget, self).__init__(**kwargs)
@@ -55,8 +56,9 @@ class BadukPanWidget(Widget):
         self.animating_pv = None
         self.last_mouse_pos = (0, 0)
         Window.bind(mouse_pos=self.on_mouse_pos)
-        self.redraw_board_contents_trigger = Clock.create_trigger(self.draw_board_contents)
-        self.redraw_trigger = Clock.create_trigger(self.redraw)
+        self.redraw_board_contents_trigger = Clock.create_trigger(self.draw_board_contents,0.05)
+        self.redraw_trigger = Clock.create_trigger(self.redraw,0.05)
+        self.redraw_hover_contents_trigger = Clock.create_trigger(self.draw_hover_contents,0.01)
         self.bind(size=self.redraw_trigger, pos=self.redraw_trigger)
         Clock.schedule_interval(self.animate_pv, 0.1)
 
@@ -81,7 +83,7 @@ class BadukPanWidget(Widget):
         else:
             self.ghost_stone = None
         if prev_ghost != self.ghost_stone:
-            self.draw_hover_contents()
+            self.redraw_hover_contents_trigger()
 
     def update_box_selection(self, touch, second_point=True):
         if not self.gridpos_x:
@@ -93,7 +95,7 @@ class BadukPanWidget(Widget):
             self.region_of_interest[3] = yp
         else:
             self.region_of_interest = [xp, xp, yp, yp]
-        self.draw_hover_contents()
+        self.redraw_hover_contents_trigger()
 
     def on_touch_down(self, touch):
         self.set_animating_pv(None, None)  # any click kills PV from label/move
@@ -186,7 +188,7 @@ class BadukPanWidget(Widget):
                         self.set_animating_pv(nodes_here[-1].parent.candidate_moves[0]["pv"], nodes_here[-1].parent)
 
         self.ghost_stone = None
-        self.draw_hover_contents()  # remove ghost
+        self.redraw_hover_contents_trigger()  # remove ghost
 
     # drawing functions
     def redraw(self, *_args):
@@ -199,7 +201,7 @@ class BadukPanWidget(Widget):
         Rectangle(
             pos=(self.gridpos_x[x] - stone_size, self.gridpos_y[y] - stone_size),
             size=(2 * stone_size, 2 * stone_size),
-            source=f"img/{player}_stone.png",
+            source=cached_resource_find(f"img/{player}_stone.png"),
         )
         if evalcol:
             eval_radius = math.sqrt(evalscale)  # scale area by evalscale
@@ -208,7 +210,7 @@ class BadukPanWidget(Widget):
             Rectangle(
                 pos=(self.gridpos_x[x] - evalsize, self.gridpos_y[y] - evalsize),
                 size=(2 * evalsize, 2 * evalsize),
-                source=f"img/dot.png",
+                source=cached_resource_find(f"img/dot.png"),
             )
         if innercol:
             Color(*innercol)
@@ -216,7 +218,7 @@ class BadukPanWidget(Widget):
             Rectangle(
                 pos=(self.gridpos_x[x] - inner_size, self.gridpos_y[y] - inner_size),
                 size=(2 * inner_size, 2 * inner_size),
-                source=f"img/inner.png",
+                source=cached_resource_find(f"img/inner.png"),
             )
 
     def eval_color(self, points_lost, show_dots_for_class: List[bool] = None) -> Optional[List[float]]:
@@ -261,7 +263,7 @@ class BadukPanWidget(Widget):
             Rectangle(
                 pos=(self.gridpos_x[0] - self.grid_size * 1.5, self.gridpos_y[0] - self.grid_size * 1.5),
                 size=(self.grid_size * x_grid_spaces, self.grid_size * y_grid_spaces),
-                source="img/board.png",
+                source=cached_resource_find("img/board.png"),
             )
 
             Color(*LINE_COLOR)
@@ -455,7 +457,7 @@ class BadukPanWidget(Widget):
                     pos=center, text=text, font_size=size * 0.25, halign="center", outline_color=[0.95, 0.95, 0.95]
                 )
 
-        self.draw_hover_contents()
+        self.redraw_hover_contents_trigger()
 
     def draw_roi_box(self, region_of_interest, width=2):
         xmin, xmax, ymin, ymax = region_of_interest
@@ -547,9 +549,9 @@ class BadukPanWidget(Widget):
                         Rectangle(
                             pos=(self.gridpos_x[move.coords[0]] - evalsize, self.gridpos_y[move.coords[1]] - evalsize),
                             size=(2 * evalsize, 2 * evalsize),
-                            source="img/topmove.png",
+                            source=cached_resource_find("img/topmove.png"),
                         )
-                        if text_on and top_moves_show:
+                        if text_on and top_moves_show: # TODO: faster if not sized?
                             keys = {"size": self.grid_size / 3, "smallsize": self.grid_size / 3.33}
                             player_sign = current_node.player_sign(current_node.next_player)
                             if len(top_moves_show) == 1:
@@ -649,7 +651,7 @@ class BadukPanWidget(Widget):
 
     def animate_pv(self, _dt):
         if self.animating_pv:
-            self.draw_hover_contents()
+            self.redraw_hover_contents_trigger()
 
     def draw_pv(self, pv, node, up_to_move):
         katrain = self.katrain
@@ -684,7 +686,7 @@ class BadukPanWidget(Widget):
             Rectangle(  # not sure why the -1 here, but seems to center better
                 pos=(board_coords[0] - stone_size - 1, board_coords[1] - stone_size),
                 size=(2 * stone_size + 1, 2 * stone_size + 1),
-                source=f"img/{move_player}_stone.png",
+                source=cached_resource_find(f"img/{move_player}_stone.png"),
             )
             Color(*STONE_TEXT_COLORS[move_player])
             draw_text(pos=board_coords, text=str(i + 1), font_size=self.grid_size * sizefac / 1.45, font_name="Roboto")
@@ -696,7 +698,7 @@ class BadukPanWidget(Widget):
             not self.animating_pv or not (self.animating_pv[0] == pv and self.animating_pv[1] == node)
         ):
             self.animating_pv = (pv, node, time.time(), self.last_mouse_pos)
-        self.draw_hover_contents()
+        self.redraw_hover_contents_trigger()
 
     def show_pv_from_comments(self, pv_str):
         self.set_animating_pv(pv_str[1:].split(" "), self.katrain.controls.active_comment_node.parent)