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

Merge branch 'view' into UI_2.0

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-09-17 09:28:53 +09:00
parent 7f888ea08a 5e7174501d
commit c719f7b510
3 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vrct_gui/_changeMainWindowWidgetsStatus.py
View File

@@ -115,24 +115,26 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta
case "minimize_sidebar_button": case "minimize_sidebar_button":
LOGO_SIZE = vrct_gui.minimize_sidebar_button.cget("image").cget("size") MINIMIZE_SIDEBAR_IMAGE_SIZE = vrct_gui.minimize_sidebar_button__for_opening.cget("image").cget("size")
if status == "disabled": if status == "disabled":
vrct_gui.minimize_sidebar_button_container.configure(cursor="") vrct_gui.minimize_sidebar_button_container__for_opening.configure(cursor="")
vrct_gui.minimize_sidebar_button_container__for_closing.configure(cursor="")
if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True: if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED).rotate(180), size=LOGO_SIZE) image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED).rotate(180), size=MINIMIZE_SIDEBAR_IMAGE_SIZE)
else: else:
image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED), size=LOGO_SIZE) image_file = CTkImage((settings.image_file.ARROW_LEFT_DISABLED), size=MINIMIZE_SIDEBAR_IMAGE_SIZE)
vrct_gui.minimize_sidebar_button.configure(image=image_file)
elif status == "normal": elif status == "normal":
vrct_gui.minimize_sidebar_button_container.configure(cursor="hand2") vrct_gui.minimize_sidebar_button_container__for_opening.configure(cursor="hand2")
vrct_gui.minimize_sidebar_button_container__for_closing.configure(cursor="hand2")
if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True: if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage((settings.image_file.ARROW_LEFT).rotate(180), size=LOGO_SIZE) image_file = CTkImage((settings.image_file.ARROW_LEFT).rotate(180), size=MINIMIZE_SIDEBAR_IMAGE_SIZE)
else: else:
image_file = CTkImage((settings.image_file.ARROW_LEFT), size=LOGO_SIZE) image_file = CTkImage((settings.image_file.ARROW_LEFT), size=MINIMIZE_SIDEBAR_IMAGE_SIZE)
vrct_gui.minimize_sidebar_button.configure(image=image_file) vrct_gui.minimize_sidebar_button__for_opening.configure(image=image_file)
vrct_gui.minimize_sidebar_button__for_closing.configure(image=image_file)
case "entry_message_box": case "entry_message_box":

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

@@ -15,36 +15,61 @@ def createMinimizeSidebarButton(settings, main_window, view_variable):
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) main_window.minimize_sidebar_button_container__for_closing = CTkFrame(main_window.main_topbar_container, corner_radius=0, fg_color=settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR, cursor="hand2", width=0, height=0)
main_window.minimize_sidebar_button_container__for_opening = CTkFrame(main_window.main_topbar_container, corner_radius=0, fg_color=settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR, cursor="hand2", width=0, height=0)
main_window.minimize_sidebar_button = CTkLabel(
main_window.minimize_sidebar_button_container, # For Closing [<]
main_window.minimize_sidebar_button__for_closing = CTkLabel(
main_window.minimize_sidebar_button_container__for_closing,
text=None, text=None,
corner_radius=0, corner_radius=0,
height=0, height=0,
image=CTkImage((settings.image_file.ARROW_LEFT),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y)) image=CTkImage((settings.image_file.ARROW_LEFT),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y))
) )
main_window.minimize_sidebar_button_container__for_closing.grid_rowconfigure((0,2), weight=1)
main_window.minimize_sidebar_button__for_closing.grid(row=1, column=0, padx=0, pady=0)
bindEnterAndLeaveColor([main_window.minimize_sidebar_button__for_closing, main_window.minimize_sidebar_button_container__for_closing], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_HOVERED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)
bindButtonPressColor([main_window.minimize_sidebar_button__for_closing, main_window.minimize_sidebar_button_container__for_closing], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)
bindButtonReleaseFunction([main_window.minimize_sidebar_button_container__for_closing, main_window.minimize_sidebar_button__for_closing], enableCompactMode)
# For Opening [>]
main_window.minimize_sidebar_button__for_opening = CTkLabel(
main_window.minimize_sidebar_button_container__for_opening,
text=None,
corner_radius=0,
height=0,
image=CTkImage((settings.image_file.ARROW_LEFT).rotate(180),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y))
)
main_window.minimize_sidebar_button_container__for_opening.grid_rowconfigure((0,2), weight=1)
main_window.minimize_sidebar_button__for_opening.grid(row=1, column=0, padx=0, pady=0)
bindEnterAndLeaveColor([main_window.minimize_sidebar_button__for_opening, main_window.minimize_sidebar_button_container__for_opening], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_HOVERED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)
bindButtonPressColor([main_window.minimize_sidebar_button__for_opening, main_window.minimize_sidebar_button_container__for_opening], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)
bindButtonReleaseFunction([main_window.minimize_sidebar_button_container__for_opening, main_window.minimize_sidebar_button__for_opening], disableCompactMode)
main_window.minimize_sidebar_button_container__for_opening.grid(row=0, column=0, sticky="nsw")
main_window.minimize_sidebar_button_container__for_closing.grid(row=0, column=0, sticky="nsw")
main_window.minimize_sidebar_button_container__for_opening.grid_remove()
main_window.minimize_sidebar_button_container__for_closing.grid_remove()
if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True: if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
image_file = CTkImage((settings.image_file.ARROW_LEFT).rotate(180),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y)) main_window.minimize_sidebar_button_container__for_opening.grid()
bindButtonReleaseFunction([main_window.minimize_sidebar_button_container, main_window.minimize_sidebar_button], disableCompactMode)
else: else:
image_file = CTkImage((settings.image_file.ARROW_LEFT),size=(settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X,settings.uism.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y)) main_window.minimize_sidebar_button_container__for_closing.grid()
bindButtonReleaseFunction([main_window.minimize_sidebar_button_container, main_window.minimize_sidebar_button], enableCompactMode)
main_window.minimize_sidebar_button_container.grid_rowconfigure((0,2), weight=1)
main_window.minimize_sidebar_button.configure(image=image_file)
main_window.minimize_sidebar_button_container.grid(row=0, column=0, sticky="nsw")
main_window.minimize_sidebar_button.grid(row=1, column=0, padx=0, pady=0)
bindEnterAndLeaveColor([main_window.minimize_sidebar_button, main_window.minimize_sidebar_button_container], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_HOVERED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)
bindButtonPressColor([main_window.minimize_sidebar_button, main_window.minimize_sidebar_button_container], settings.ctm.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR, settings.ctm.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR)

7
vrct_gui/vrct_gui.py
View File

@@ -156,15 +156,16 @@ class VRCT_GUI(CTk):
) )
def recreateMainWindowSidebar(self): def recreateMainWindowSidebar(self):
self.minimize_sidebar_button_container.destroy()
createMinimizeSidebarButton(self.settings.main, self, view_variable=self._view_variable)
if self._view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE: if self._view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE:
self.sidebar_bg_container.grid_remove() self.sidebar_bg_container.grid_remove()
self.sidebar_compact_mode_bg_container.grid() self.sidebar_compact_mode_bg_container.grid()
self.minimize_sidebar_button_container__for_closing.grid_remove()
self.minimize_sidebar_button_container__for_opening.grid()
else: else:
self.sidebar_compact_mode_bg_container.grid_remove() self.sidebar_compact_mode_bg_container.grid_remove()
self.sidebar_bg_container.grid() self.sidebar_bg_container.grid()
self.minimize_sidebar_button_container__for_opening.grid_remove()
self.minimize_sidebar_button_container__for_closing.grid()
vrct_gui = VRCT_GUI() vrct_gui = VRCT_GUI()