Merge pull request #648 from MyreMylar/show_hide_options_2

Add better option to disable hiding/showing contained elements of containers
MyreMylar · Nov 3, 2024 · 45de6bd · 45de6bd
2 parents 9872980 + ca740d1
commit 45de6bd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/pygame_gui/elements/ui_scrolling_container.py b/pygame_gui/elements/ui_scrolling_container.py
@@ -523,8 +523,15 @@ def show(self, show_contents: bool = True):
         :param show_contents: whether to also show the contents of the container. Defaults to True.
         """
         super().show()
-        if self._root_container is not None:
-            self._root_container.show(show_contents)
+
+        self._root_container.show(show_contents=False)
+        if self.vert_scroll_bar is not None:
+            self.vert_scroll_bar.show()
+        if self.horiz_scroll_bar is not None:
+            self.horiz_scroll_bar.show()
+
+        if self._view_container is not None:
+            self._view_container.show(show_contents)
 
     def hide(self, hide_contents: bool = True):
         """
@@ -537,9 +544,14 @@ def hide(self, hide_contents: bool = True):
         """
         if not self.visible:
             return
+        self._root_container.hide(hide_contents=False)
+        if self.vert_scroll_bar is not None:
+            self.vert_scroll_bar.hide()
+        if self.horiz_scroll_bar is not None:
+            self.horiz_scroll_bar.hide()
 
-        if self._root_container is not None:
-            self._root_container.hide(hide_contents)
+        if self._view_container is not None:
+            self._view_container.hide(hide_contents)
         super().hide()
 
     def __iter__(self) -> Iterator[IUIElementInterface]:

diff --git a/pygame_gui/elements/ui_window.py b/pygame_gui/elements/ui_window.py
@@ -758,8 +758,13 @@ def show(self, show_contents: bool = True):
         :param show_contents: whether to also show the contents of the window. Defaults to True.
         """
         super().show()
-        if self._window_root_container is not None:
-            self._window_root_container.show()
+        self._window_root_container.show(show_contents=False)
+        if self.title_bar is not None:
+            self.title_bar.show()
+        if self.close_window_button is not None:
+            self.close_window_button.show()
+        if self.window_element_container is not None:
+            self.window_element_container.show(show_contents)
 
     def hide(self, hide_contents: bool = True):
         """
@@ -772,8 +777,13 @@ def hide(self, hide_contents: bool = True):
             return
 
         super().hide()
-        if self._window_root_container is not None:
-            self._window_root_container.hide(hide_contents)
+        self._window_root_container.hide(hide_contents=False)
+        if self.title_bar is not None:
+            self.title_bar.hide()
+        if self.close_window_button is not None:
+            self.close_window_button.hide()
+        if self.window_element_container is not None:
+            self.window_element_container.hide(hide_contents)
 
     def get_relative_mouse_pos(self):
         """