From 6ad0d78b5afa7ebb451713f80cfa93491a3873b8 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Fri, 30 Jun 2023 22:59:40 +0800 Subject: [PATCH] use pyglet.TextEntry --- Difficult_Rocket/client/__init__.py | 6 +- Difficult_Rocket/client/guis/widgets.py | 243 ------------------------ configs/main.toml | 4 +- 3 files changed, 5 insertions(+), 248 deletions(-) diff --git a/Difficult_Rocket/client/__init__.py b/Difficult_Rocket/client/__init__.py index eb62804..c4c687e 100644 --- a/Difficult_Rocket/client/__init__.py +++ b/Difficult_Rocket/client/__init__.py @@ -26,6 +26,7 @@ import pyglet from pyglet.graphics import Group, Batch from pyglet.window import Window from pyglet.window import key, mouse +from pyglet.gui.widgets import TextEntry # Difficult_Rocket function if TYPE_CHECKING: @@ -40,7 +41,6 @@ from Difficult_Rocket.api.screen import BaseScreen from Difficult_Rocket.utils.thread import new_thread from Difficult_Rocket.client.screen import DRDEBUGScreen from Difficult_Rocket.client.fps.fps_log import FpsLogger -from Difficult_Rocket.client.guis.widgets import InputBox from Difficult_Rocket.exception.language import LanguageNotFound @@ -235,8 +235,8 @@ class ClientWindow(Window): # 命令显示 self.command_batch = Batch() self.command_group = Group(1, parent=self.main_group) - self.input_box = InputBox(x=50, y=30, width=300, - batch=self.command_batch, text='') # 实例化 + self.input_box = TextEntry(x=50, y=30, width=300, + batch=self.command_batch, text='') # 实例化 self.input_box.push_handlers(self) self.input_box.set_handler('on_commit', self.on_input) self.set_handlers(self.input_box) diff --git a/Difficult_Rocket/client/guis/widgets.py b/Difficult_Rocket/client/guis/widgets.py index c1ab651..b20d2ea 100644 --- a/Difficult_Rocket/client/guis/widgets.py +++ b/Difficult_Rocket/client/guis/widgets.py @@ -57,246 +57,3 @@ class TextButton(widgets.WidgetBase): def _update_position(self): self.text_label.position = self._x, self._y ... - - -if not DR_status.InputBox_use_TextEntry: - class InputBox(widgets.TextEntry): - """ 自定义的输入框 """ - - def __init__(self, x: int, y: int, width: int, - text: str, - side_width: int = 2, - font_data: Optional[FontData] = None, - color: Optional[Tuple[int, int, int, int]] = (255, 255, 255, 255), - text_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0, 255), - caret_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0), - batch: Optional[Batch] = None, group: Optional[Group] = None): - if font_data is None: - font_data = FontData() - self._doc = UnformattedDocument(text) - self._doc.set_style(0, len(self._doc.text), {**font_data.dict(), 'text_color': text_color}) - font = self._doc.get_font() - height = font.ascent - font.descent - - self._user_group = group - bg_group = Group(order=0, parent=group) - fg_group = Group(order=1, parent=group) - - # Rectangular outline with 2-pixel pad: - self._pad = p = side_width - self._outline = Rectangle(x-p, y-p, width+p+p, height+p+p, color[:3], batch, bg_group) - self._outline.opacity = color[3] - - # Text and Caret: - self._layout = IncrementalTextLayout(self._doc, width, height, multiline=False, batch=batch, group=fg_group) - self._layout.x = x - self._layout.y = y - self._caret = Caret(self._layout, color=caret_color) - self._caret.visible = False - - self._focus = False - super().__init__() - - # InputBox.register_event_type('on_commit') - - - # class InputBox(widgets.WidgetBase): - # """ - # input box - # """ - # - # def __init__(self, - # x: int, y: int, width: int, height: int, - # message: str = '', - # font_name: str = translate.微软等宽, - # font_size: int = 15, - # font_bold: bool = False, - # font_italic: bool = False, - # font_stretch: bool = False, - # font_dpi: int = 100, - # text_color: [int, int, int] = (187, 187, 187, 255), - # out_line_color: [int, int, int] = (37, 116, 176), - # cursor_color: [int, int, int] = (187, 187, 187), - # select_color: [int, int, int] = (63, 115, 255), - # out_line: int = 2, - # batch: Batch = None, - # group: Group = None): - # if batch is None: - # batch = Batch() - # if group is None: - # group = Group() - # super().__init__(x, y, width, height) - # self.enabled = False - # self._text = message - # self._cursor_poi = 0 - # self.font = font.load(name=font_name, size=font_size, - # bold=font_bold, italic=font_italic, stretch=font_stretch, - # dpi=font_dpi) - # self.font_height = self.font.ascent - self.font.descent - # self.out_bound = out_line - # if DR_status.InputBox_use_TextEntry: - # # 基于IncrementalTextLayout的处理系统 - # self._doc = FormattedDocument(message) - # # self._doc.set_style() - # self._layout = IncrementalTextLayout(self._doc, self.font, width, height, - # batch=batch, group=group) - # self._input_box = widgets.TextEntry(x, y, width, height, - # self._doc, self._layout, - # batch=batch, group=group) - # else: - # # 基于Label的处理系统 - # self._input_box = Label(x=x + out_line, y=y + out_line, - # width=width, height=self.font_height + self.out_bound * 2, - # color=text_color, - # font_name=font_name, font_size=font_size, - # batch=batch, group=group, - # text=message) - # self._HTML_box = HTMLLabel(x=x + out_line, y=y + out_line + 30, - # width=width, height=self.font_height + self.out_bound * 2, - # batch=batch, group=group, - # text=message) - # self._out_box = Rectangle(x=x - out_line, y=y - out_line, - # color=out_line_color, - # width=width + (out_line * 2), height=height + (out_line * 2), - # batch=batch, group=group) - # self._光标 = Rectangle(x=x + out_line, y=y + out_line, - # color=cursor_color, - # width=1, height=self.font_height, - # batch=batch, group=group) - # self._选择框 = Rectangle(x=x, y=y, width=0, height=self.font_height, - # color=select_color) - # self._选择的字 = Label(x=x, y=y, width=0, height=self.font_height, - # color=text_color, - # font_name=font_name, font_size=font_size, - # batch=batch, group=group, - # text='') - # - # """ - # 输入框的属性 - # """ - # - # # 本身属性 - # @property - # def text(self) -> str: # 输入框的文本 - # return self._text - # - # @text.setter - # def text(self, value) -> None: - # assert type(value) is str, 'Input Box\'s text must be string!' - # self._text = value - # self._input_box.text = value - # self._HTML_box.text = html.decode_text2HTML(value, show_style=True) - # - # @property - # def cursor_poi(self) -> int: # 光标位置 - # return self._cursor_poi - # - # @cursor_poi.setter - # def cursor_poi(self, value) -> None: - # assert type(value) is int, 'Input Box\'s cursor poi must be int!' - # self._cursor_poi = value - # self._光标.x = self.x + self.out_bound + self._input_box.content_width - # - # # 渲染时属性 - # @property - # def opacity(self) -> int: # 透明度 - # return self._input_box.opacity - # - # @opacity.setter - # def opacity(self, value: int) -> None: - # assert type(value) is int, 'Input Box\'s opacity must be int!' - # self._input_box.opacity = value - # self._out_box.opacity = value - # self._选择的字.opacity = value - # self._选择框.opacity = value - # self._光标.opacity = value - # - # @property - # def visible(self) -> bool: # 是否可见 - # return self._input_box.visible - # - # @visible.setter - # def visible(self, value: bool) -> None: - # assert type(value) is bool, 'Input Box\'s visible must be bool!' - # self._input_box.visible = value - # self._out_box.visible = value - # self._选择的字.visible = value - # self._选择框.visible = value - # self._光标.visible = value - # - # @property - # def value(self) -> str: - # return self._text - # - # """ - # 事件调用 - # """ - # - # def _update_position(self): - # self._input_box.position = self._x + self.out_bound, self._y + self.out_bound - # self._out_box.position = self._x - self.out_bound, self._y - self.out_bound - # self._光标.position = self._x + self.out_bound, self._y + self.out_bound - # - # # 输入东西 - # def on_text(self, text: str): - # if self.enabled: - # if text in ('\r', '\n'): - # if self.text: - # self.dispatch_event('on_commit', self.text) - # else: - # self.text = f'{self.text[:self.cursor_poi]}{text}{self.text[self.cursor_poi:]}' - # self.cursor_poi += len(text) - # - # # 移动光标 - # def on_text_motion(self, motion): - # if self.enabled: - # # 根据按键处理 - # # 单格移动光标(上下左右) - # if motion in (key.MOTION_UP, key.MOTION_LEFT): # 往上一个移动 - # self.cursor_poi = max(0, self._cursor_poi - 1) - # elif motion in (key.MOTION_DOWN, key.MOTION_RIGHT): # 往下一个移动 - # self.cursor_poi = min(len(self.text), self._cursor_poi + 1) - # # 大前后移动(开头或结尾) - # elif motion in ( - # key.MOTION_BEGINNING_OF_LINE, key.MOTION_BEGINNING_OF_FILE, key.MOTION_PREVIOUS_PAGE): # 开头 - # self.cursor_poi = 0 - # elif motion in (key.MOTION_END_OF_LINE, key.MOTION_END_OF_FILE, key.MOTION_NEXT_PAGE): # 结尾 - # self.cursor_poi = len(self.text) - # # 删除操作 - # elif motion == key.MOTION_BACKSPACE: - # if self.text: # 如果有文字 - # self.text = f'{self.text[:self.cursor_poi - 1]}{self.text[self.cursor_poi:]}' - # self.cursor_poi = max(0, self._cursor_poi - 1) - # elif motion == key.MOTION_DELETE: - # if self.text and self.cursor_poi != len(self.text) - 1: # 如果有文字，并且光标不在最后 - # self.text = f'{self.text[:self.cursor_poi]}{self.text[self.cursor_poi + 1:]}' - # # 剪贴板操作 - # elif motion == key.MOTION_COPY: - # pass - # elif motion == key.MOTION_PASTE: - # paste_text = paste() - # self.text = f'{self.text[:self.cursor_poi]}{paste_text}{self.text[self.cursor_poi:]}' - # self.cursor_poi += len(paste_text) - # - # def on_text_motion_select(self, motion): - # pass - # - # def on_mouse_press(self, x, y, buttons, modifiers): - # if self._check_hit(x, y) and self._input_box.visible: - # self.enabled = True - # else: - # self.enabled = False - # - # def on_mouse_drag(self, x, y, dx, dy, buttons, modifiers): - # pass - # - # def on_mouse_release(self, x, y, buttons, modifiers): - # pass - # - # def on_commit(self, text: str): - # pass - -else: - InputBox = widgets.TextEntry - # class InputBox(widgets.TextEntry): - # pass diff --git a/configs/main.toml b/configs/main.toml index 1fa198a..946b58f 100644 --- a/configs/main.toml +++ b/configs/main.toml @@ -7,8 +7,8 @@ fonts_folder = "libs/fonts" [window] style = "None" -width = 1524 -height = 1200 +width = 1032 +height = 735 visible = true gui_scale = 1 caption = "Difficult Rocket v{DR_version}"