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

view.pyへサイドバー開閉回りの変数を移動。関数は(view.pyがwrapperしているけど)vrct_gui.pyへ移動。

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-09-04 00:06:43 +09:00
parent 38870a6638
commit c232f5e5cd
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vrct_gui/main_window/widgets/create_minimize_sidebar_button.py
View File

@@ -3,24 +3,16 @@ from customtkinter import CTkFrame, CTkLabel, CTkImage
from ...ui_utils import getImageFileFromUiUtils, bindEnterAndLeaveColor, bindButtonPressColor, bindButtonReleaseFunction
from .create_sidebar import createSidebar
from utils import callFunctionIfCallable
def createMinimizeSidebarButton(settings, main_window):
def enableCompactMode(e):
settings.IS_SIDEBAR_COMPACT_MODE = True
main_window.minimize_sidebar_button_container.destroy()
createMinimizeSidebarButton(settings, main_window)
main_window.sidebar_bg_container.destroy()
createSidebar(settings, main_window)
callFunctionIfCallable(main_window.view_variable.CALLBACK_TOGGLE_MAIN_WINDOW_SIDEBAR_COMPACT_MODE, True)
def disableCompactMode(e):
settings.IS_SIDEBAR_COMPACT_MODE = False
main_window.minimize_sidebar_button_container.destroy()
createMinimizeSidebarButton(settings, main_window)
main_window.sidebar_bg_container.destroy()
createSidebar(settings, main_window)
callFunctionIfCallable(main_window.view_variable.CALLBACK_TOGGLE_MAIN_WINDOW_SIDEBAR_COMPACT_MODE, False)
main_window.minimize_sidebar_button_container = CTkFrame(main_window.main_topbar_container, corner_radius=0, fg_color=settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR, cursor="hand2", width=0, height=0)
@@ -36,7 +28,7 @@ def createMinimizeSidebarButton(settings, main_window):
)
if settings.IS_SIDEBAR_COMPACT_MODE is True:
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage(getImageFileFromUiUtils(settings.image_filename.ARROW_LEFT).rotate(180),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y))
bindButtonReleaseFunction([main_window.minimize_sidebar_button_container, main_window.minimize_sidebar_button], disableCompactMode)

8
vrct_gui/main_window/widgets/create_sidebar.py
View File

@@ -175,7 +175,7 @@ def createSidebar(settings, main_window):
main_window.sidebar_bg_container.grid(row=0, column=0, sticky="nsew")
MIN_SIDEBAR_WIDTH = settings.uism.COMPACT_MODE_SIDEBAR_WIDTH if settings.IS_SIDEBAR_COMPACT_MODE is True else settings.uism.SIDEBAR_WIDTH
MIN_SIDEBAR_WIDTH = settings.uism.COMPACT_MODE_SIDEBAR_WIDTH if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True else settings.uism.SIDEBAR_WIDTH
main_window.sidebar_bg_container.grid_columnconfigure(0, weight=0, minsize=MIN_SIDEBAR_WIDTH)
main_window.grid_rowconfigure(0, weight=1)
@@ -200,7 +200,7 @@ def createSidebar(settings, main_window):
image=CTkImage(img, size=(width,height))
)
if settings.IS_SIDEBAR_COMPACT_MODE is True:
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
main_window.sidebar_compact_mode_logo.grid(row=0, column=0, pady=(
int(settings.uism.SF__LOGO_PADY[0]+a_s/2),
int(settings.uism.SF__LOGO_PADY[1]+a_s/2)
@@ -338,7 +338,7 @@ def createSidebar(settings, main_window):
# Arrange
if settings.IS_SIDEBAR_COMPACT_MODE is True:
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
compact_mode_icon_widget.grid(row=row, column=0, pady=settings.uism.SF__COMPACT_MODE_ICON_PADY)
selected_mark_widget.place(relx=-1, rely=0.5, relheight=0.75, anchor="center")
else:
@@ -386,7 +386,7 @@ def createSidebar(settings, main_window):
# Sidebar Quick Language Settings, SQLS
main_window.sls__container = CTkFrame(main_window.sidebar_bg_container, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0)
if settings.IS_SIDEBAR_COMPACT_MODE is False:
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is False:
main_window.sls__container.grid(row=2, column=0, sticky="new")
main_window.sls__container.grid_columnconfigure(0, weight=1)