Merge pull request #369 from ppizarror/fix-build

Menu resize

Author: ppizarror

.gitignore

@@ -36,4 +36,5 @@ pyproject.toml
 *.lock
 
 # MacOS files
-.DS_Store
+.DS_Store
+**._*

build.bat

@@ -0,0 +1,60 @@
+"""
+pygame-menu
+https://github.com/ppizarror/pygame-menu
+
+BUILD
+
+License:
+-------------------------------------------------------------------------------
+The MIT License (MIT)
+Copyright 2017-2021 Pablo Pizarro R. @ppizarror
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-------------------------------------------------------------------------------
+"""
+
+import os
+import sys
+
+assert len(sys.argv) == 2, 'Argument is required, usage: build.py pip/twine/gource'
+mode = sys.argv[1].strip()
+python = 'python3' if not sys.platform == 'win32' else 'py -3.7'
+
+if mode == 'pip':
+    if os.path.isdir('dist'):
+        for k in os.listdir('dist'):
+            if 'pygame_menu-' in k:
+                os.remove(f'dist/{k}')
+    if os.path.isdir('build'):
+        for k in os.listdir('build'):
+            if 'bdist.' in k or k == 'lib':
+                os.system(f'rm -rf build/{k}')
+    os.system(f'{python} setup.py sdist bdist_wheel')
+
+elif mode == 'twine':
+    if os.path.isdir('dist'):
+        os.system(f'{python} -m twine upload dist/*')
+    else:
+        raise FileNotFoundError('Not distribution been found, execute build.py pip')
+
+elif mode == 'gource':
+    os.system('gource -s 0.25 --title pygame-menu --disable-auto-rotate --key '
+              '--highlight-users --disable-bloom --multi-sampling -w --transparent --path ./')
+
+else:
+    raise ValueError(f'Unknown mode {mode}')

build.py

@@ -1,4 +1,6 @@
 ignore:
   - "docs/*.py"
   - "pygame_menu/__pyinstaller/*py"
+  - "pygame_menu/examples/*.py"
+  - "pygame_menu/examples/other/*.py"
   - "test/*.py"

codecov.yml

@@ -13,6 +13,7 @@ examples, simply execute these commands in a terminal:
     $> python3 -m pygame_menu.examples.scroll_menu
     $> python3 -m pygame_menu.examples.simple
     $> python3 -m pygame_menu.examples.timer_clock
+    $> python3 -m pygame_menu.examples.window_resize
 
 Other examples that show specific use cases of the menu are also provided:
 
@@ -40,16 +41,6 @@ Also, check out widget-specific examples in the
 `Adding Widgets <https://pygame-menu.readthedocs.io/en/latest/_source/add_widgets.html>`_
 documentation page.
 
-Simple example
---------------
-
-.. image:: ../_static/example_simple.gif
-    :align: center
-    :alt: A basic button menu
-    :width: 600
-
-Source: `examples/simple.py <https://github.com/ppizarror/pygame-menu/blob/master/pygame_menu/examples/simple.py>`_
-
 
 Game selector example
 ---------------------
@@ -84,6 +75,17 @@ Scroll menu example
 Source: `examples/scroll_menu.py <https://github.com/ppizarror/pygame-menu/blob/master/pygame_menu/examples/scroll_menu.py>`_
 
 
+Simple example
+--------------
+
+.. image:: ../_static/example_simple.gif
+    :align: center
+    :alt: A basic button menu
+    :width: 600
+
+Source: `examples/simple.py <https://github.com/ppizarror/pygame-menu/blob/master/pygame_menu/examples/simple.py>`_
+
+
 Timer clock example
 -------------------
 
@@ -95,6 +97,17 @@ Timer clock example
 Source: `examples/timer_clock.py <https://github.com/ppizarror/pygame-menu/blob/master/pygame_menu/examples/timer_clock.py>`_
 
 
+Window resize example
+------------------------
+
+.. image:: ../_static/example_window_resize.gif
+    :align: center
+    :alt: Reizable window example
+    :width: 600
+
+Source: `examples/window_resize.py <https://github.com/ppizarror/pygame-menu/blob/master/pygame_menu/examples/window_resize.py>`_
+
+
 Other - Calculator (Decoration, Events, OOP, Frames)
 ----------------------------------------------------
 

docs/_source/gallery.rst

@@ -55,7 +55,7 @@
 
 from pygame_menu._types import Union, NumberType, Tuple, List, Dict, Tuple2NumberType, \
     CursorInputType, Optional, Tuple2IntType, NumberInstance, ColorInputType, \
-    EventVectorType, EventType, VectorInstance, StringVector
+    EventVectorType, EventType, VectorInstance, StringVector, Any
 
 
 def get_scrollbars_from_position(
@@ -145,6 +145,7 @@ class ScrollArea(Base):
     _menubar: 'pygame_menu.widgets.MenuBar'
     _parent_scrollarea: 'ScrollArea'
     _rect: 'pygame.Rect'
+    _scrollbars_props: Tuple[Any, ...]
     _scrollbar_positions: Tuple[str, ...]
     _scrollbar_thick: int
     _scrollbars: List['ScrollBar']
@@ -220,20 +221,46 @@ def __init__(
         self._bg_surface = None
         self._bg_surface = None
         self._decorator = Decorator(self)
-        self._rect = pygame.Rect(0, 0, int(area_width), int(area_height))
         self._scrollbar_positions = tuple(unique_scrolls)  # Ensure unique
         self._scrollbar_thick = scrollbar_thick
-        self._scrollbars = []
         self._translate = (0, 0)
         self._world = world
 
         self._extend_x = extend_x
         self._extend_y = extend_y
         self._menubar = menubar
 
+        self._scrollbars_props = (scrollbar_color, scrollbar_thick, scrollbar_slider_color,
+                                  scrollbar_slider_hover_color, scrollbar_slider_pad,
+                                  scrollbar_cursor, shadow, shadow_color, shadow_position,
+                                  shadow_offset, controls_joystick, controls_mouse,
+                                  controls_touchscreen, controls_keyboard)
         self.set_parent_scrollarea(parent_scrollarea)
+        self.create_rect(area_width, area_height)
+
+        # Menu reference
+        self._menu = None
+
+    def create_rect(self, width: int, height: int) -> None:
+        """
+        Create rect object.
+
+        :param width: Area width
+        :param height: Area height
+        """
+        assert isinstance(width, int)
+        assert isinstance(height, int)
+        self._rect = pygame.Rect(0, 0, int(width), int(height))
+        self._scrollbars = []
         self._view_rect = self.get_view_rect()
 
+        # Unpack properties
+        (scrollbar_color, scrollbar_thick, scrollbar_slider_color,
+         scrollbar_slider_hover_color, scrollbar_slider_pad,
+         scrollbar_cursor, shadow, shadow_color, shadow_position,
+         shadow_offset, controls_joystick, controls_mouse, controls_touchscreen,
+         controls_keyboard) = self._scrollbars_props
+
         for pos in self._scrollbar_positions:
             assert_position(pos)
 
@@ -283,9 +310,6 @@ def __init__(
 
         self._apply_size_changes()
 
-        # Menu reference
-        self._menu = None
-
     def _make_background_surface(self) -> None:
         """
         Create background surface.

docs/_static/example_window_resize.gif

@@ -0,0 +1,85 @@
+"""
+pygame-menu
+https://github.com/ppizarror/pygame-menu
+
+EXAMPLE - WINDOW RESIZE
+Resize the menu when the window is resized.
+
+License:
+-------------------------------------------------------------------------------
+The MIT License (MIT)
+Copyright 2017-2021 Pablo Pizarro R. @ppizarror
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-------------------------------------------------------------------------------
+"""
+
+import pygame
+import pygame_menu
+
+pygame.init()
+
+surface = pygame.display.set_mode((600, 400), pygame.RESIZABLE)
+pygame.display.set_caption("Example resizable window")
+
+menu = pygame_menu.Menu(
+    height=100,
+    theme=pygame_menu.themes.THEME_BLUE,
+    title='Welcome',
+    width=100
+)
+
+
+def on_resize() -> None:
+    """
+    Function checked if the window is resized.
+    """
+    window_size = surface.get_size()
+    new_w, new_h = 0.75 * window_size[0], 0.7 * window_size[1]
+    menu.resize(new_w, new_h)
+    print(f'New menu size: {menu.get_size()}')
+
+
+menu.add.label('Resize the window!')
+user_name = menu.add.text_input('Name: ', default='John Doe', maxchar=10)
+menu.add.selector('Difficulty: ', [('Hard', 1), ('Easy', 2)])
+menu.add.button('Quit', pygame_menu.events.EXIT)
+menu.enable()
+on_resize()  # Set initial size
+
+if __name__ == '__main__':
+    while True:
+        events = pygame.event.get()
+        for event in events:
+            if event.type == pygame.QUIT:
+                pygame.quit()
+                break
+            if event.type == pygame.VIDEORESIZE:
+                # Update the surface
+                surface = pygame.display.set_mode((event.w, event.h),
+                                                  pygame.RESIZABLE)
+                # Call the menu event
+                on_resize()
+
+        # Draw the menu
+        surface.fill((25, 0, 50))
+
+        menu.update(events)
+        menu.draw(surface)
+
+        pygame.display.flip()