DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

typing + window pointer set

Browse Source
This commit is contained in:
shenjack 2023-04-19 00:44:41 +08:00
parent 5b24a0a240
commit 64898723bb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Difficult_Rocket/client/__init__.py
View File

@ -116,9 +116,11 @@ def pyglet_load_fonts_folder(folder) -> None:
def _call_screen_after(func: Callable) -> Callable: def _call_screen_after(func: Callable) -> Callable:
@functools.wraps(func) @functools.wraps(func)
def warped(self, *args, **kwargs): def warped(self: "ClientWindow", *args, **kwargs):
result = func(self, *args, **kwargs) result = func(self, *args, **kwargs)
for a_screen in self.screen_list: for a_screen in self.screen_list:
a_screen.window_pointer = self
# 提前帮子窗口设置好指针
if hasattr(a_screen, func.__name__): if hasattr(a_screen, func.__name__):
try: try:
getattr(a_screen, func.__name__)(*args, **kwargs, window=self) getattr(a_screen, func.__name__)(*args, **kwargs, window=self)
@ -132,8 +134,10 @@ def _call_screen_after(func: Callable) -> Callable:
def _call_screen_before(func: Callable) -> Callable: def _call_screen_before(func: Callable) -> Callable:
@functools.wraps(func) @functools.wraps(func)
def warped(self, *args, **kwargs): def warped(self: "ClientWindow", *args, **kwargs):
for a_screen in self.screen_list: for a_screen in self.screen_list:
a_screen.window_pointer = self
# 提前帮子窗口设置好指针
if hasattr(a_screen, func.__name__): if hasattr(a_screen, func.__name__):
try: try:
getattr(a_screen, func.__name__)(*args, **kwargs, window=self) getattr(a_screen, func.__name__)(*args, **kwargs, window=self)
@ -177,7 +181,7 @@ class ClientWindow(Window):
# frame # frame
self.frame = pyglet.gui.Frame(self, order=20) self.frame = pyglet.gui.Frame(self, order=20)
self.M_frame = pyglet.gui.MovableFrame(self, modifier=key.LCTRL) self.M_frame = pyglet.gui.MovableFrame(self, modifier=key.LCTRL)
self.screen_list = [] self.screen_list: List[BaseScreen] = []
# setup # setup
self.setup() self.setup()
# 命令显示 # 命令显示
@ -202,7 +206,6 @@ class ClientWindow(Window):
def setup(self): def setup(self):
self.load_fonts() self.load_fonts()
self.screen_list: List[BaseScreen]
# TODO 读取配置文件，加载不同的屏幕，解耦 # TODO 读取配置文件，加载不同的屏幕，解耦
self.screen_list.append(DRDEBUGScreen(self)) self.screen_list.append(DRDEBUGScreen(self))
self.screen_list.append(DRScreen(self)) self.screen_list.append(DRScreen(self))