every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix] Main Window: メッセージ入力欄Disabled時でも、フォーカスを当ててエンターキーを押せば、送信出来てしまっていたのを修正。

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-01-07 05:49:17 +09:00
parent 827e92e6f3
commit 29def026fc
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
view.py
View File

@@ -94,6 +94,8 @@ class View():
CALLBACK_WHEN_DETECT_WINDOW_OVERED_SIZE=self._showDisplayOverUiSizeConfirmationModal, CALLBACK_WHEN_DETECT_WINDOW_OVERED_SIZE=self._showDisplayOverUiSizeConfirmationModal,
IS_ENTRY_MESSAGE_BOX_DISABLED=False,
# Confirmation Modal # Confirmation Modal
CALLBACK_HIDE_CONFIRMATION_MODAL=None, CALLBACK_HIDE_CONFIRMATION_MODAL=None,
CALLBACK_ACCEPTED_CONFIRMATION_MODAL=None, CALLBACK_ACCEPTED_CONFIRMATION_MODAL=None,
@@ -510,6 +512,8 @@ class View():
def adjustedMessageBoxReturnFunction(_e): def adjustedMessageBoxReturnFunction(_e):
if self.view_variable.IS_ENTRY_MESSAGE_BOX_DISABLED is True:
return
if config.SEND_MESSAGE_BUTTON_TYPE != "show_and_disable_enter_key": if config.SEND_MESSAGE_BUTTON_TYPE != "show_and_disable_enter_key":
main_window_registers.get("message_box_bind_Return")() main_window_registers.get("message_box_bind_Return")()
return "break" # For deleting the next line that will be inserted when the Enter key is pressed. return "break" # For deleting the next line that will be inserted when the Enter key is pressed.

2
vrct_gui/_changeMainWindowWidgetsStatus.py
View File

@@ -142,8 +142,10 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
case "entry_message_box": case "entry_message_box":
if status == "disabled": if status == "disabled":
vrct_gui.entry_message_box.configure(state="disabled", text_color=settings.ctm.TEXTBOX_ENTRY_TEXT_DISABLED_COLOR) vrct_gui.entry_message_box.configure(state="disabled", text_color=settings.ctm.TEXTBOX_ENTRY_TEXT_DISABLED_COLOR)
view_variable.IS_ENTRY_MESSAGE_BOX_DISABLED = True
elif status == "normal": elif status == "normal":
vrct_gui.entry_message_box.configure(state="normal", text_color=settings.ctm.TEXTBOX_ENTRY_TEXT_COLOR) vrct_gui.entry_message_box.configure(state="normal", text_color=settings.ctm.TEXTBOX_ENTRY_TEXT_COLOR)
view_variable.IS_ENTRY_MESSAGE_BOX_DISABLED = False
case "send_message_button": case "send_message_button":