Skip to content

Commit 67cb042

Browse files
authored
use make_gui so that others reusing tracker so under 3297 there is no… (ArchipelagoMW#18)
* use make_gui so that others reusing tracker so under 3297 there is no special handling needed for the kivy side * update to have make_gui return the class not instance
1 parent 136bd1d commit 67cb042

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

worlds/tracker/TrackerClient.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -337,23 +337,19 @@ def update_available_hints(log: HintLog, hints: typing.Set[typing.Dict[str, typi
337337

338338
HintLog.refresh_hints = update_available_hints
339339

340-
def run_gui(self):
341-
from kvui import GameManager
340+
def make_gui(self):
341+
ui = super().make_gui(self) # before the kivy imports so kvui gets loaded first
342342
from kivy.properties import StringProperty, NumericProperty, BooleanProperty
343343
try:
344344
from kvui import ImageLoader #one of these needs to be loaded
345345
except ImportError:
346346
from .TrackerKivy import ImageLoader #use local until ap#3629 gets merged/released
347-
348347

349-
class TrackerManager(GameManager):
348+
class TrackerManager(ui):
350349
source = StringProperty("")
351350
loc_size = NumericProperty(20)
352351
loc_border = NumericProperty(5)
353352
enable_map = BooleanProperty(False)
354-
logging_pairs = [
355-
("Client", "Archipelago")
356-
]
357353
base_title = "Archipelago Tracker Client"
358354

359355
def build(self):
@@ -365,10 +361,8 @@ def build(self):
365361

366362
return container
367363

368-
self.ui = TrackerManager(self)
369364
self.load_kv()
370-
self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
371-
return self
365+
return TrackerManager
372366

373367
def load_kv(self):
374368
from kivy.lang import Builder

0 commit comments

Comments
 (0)