menu

Author: JaskRendix

tuxemon/menu/theme.py

@@ -80,7 +80,7 @@ def get_theme(scaling: ScalingStrategy) -> Theme:
     if _theme is not None:
         return _theme
 
-    scale_factor = max(scaling.scale, 1)
+    scale_factor = max(scaling.scale_int(1), 1)
     tuxemon_border = BaseImage(
         image_path=transform_resource_filename(CONFIG.menu_border),
     ).scale(scale_factor, scale_factor, smooth=False)

tuxemon/prepare.py

@@ -45,7 +45,6 @@ class DisplayContext:
 )
 
 
-SCREEN_SIZE = CONFIG.resolution
 DEV_TOOLS = CONFIG.dev_tools
 
 

tuxemon/states/calendar.py

@@ -11,7 +11,6 @@
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.platform.const.graphics import BG_MISSIONS
 from tuxemon.platform.const.sizes import MONTH_KEYS
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.session import Session
 
 if TYPE_CHECKING:
@@ -30,7 +29,7 @@ def __init__(
     ) -> None:
         self.session = session
 
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
 
         width = int(width * 0.8)
         height = int(height * 0.8)

tuxemon/states/celestial.py

@@ -11,7 +11,6 @@
 from tuxemon.locale.locale import T
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.platform.const.graphics import BG_MISSIONS
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.session import Session
 
 if TYPE_CHECKING:
@@ -31,7 +30,7 @@ def __init__(
         self.session = session
         self.celestial = session.celestial
 
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
 
         width = int(width * 0.8)
         height = int(height * 0.8)

tuxemon/states/character.py

@@ -19,7 +19,6 @@
 from tuxemon.platform.const import buttons
 from tuxemon.platform.const.graphics import BG_PLAYER1, BG_PLAYER2
 from tuxemon.platform.const.sizes import U_KM, U_MI
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.tools import fix_measure, format_playtime
 from tuxemon.tuxepedia.reporter import TuxepediaReporter
 
@@ -211,7 +210,7 @@ def __init__(
         if not lookup_cache:
             _lookup_monsters()
 
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
         self.char = character
 
         bg = (

tuxemon/states/choice_item.py

@@ -13,7 +13,6 @@
 from tuxemon.db import ItemModel
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.menu.theme import get_theme
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.tools import fix_measure
 from tuxemon.ui.menu_options import MenuOptions
 
@@ -71,7 +70,7 @@ def __init__(
     def calculate_window_size(
         self, menu: MenuOptions
     ) -> tuple[int, int, float]:
-        _width, _height = SCREEN_SIZE
+        _width, _height = self.client.context.resolution
 
         if len(menu.options) >= self.config.max_elements:
             height = _height * self.config.max_height_percentage

tuxemon/states/choice_monster.py

@@ -17,7 +17,6 @@
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.menu.theme import get_theme
 from tuxemon.monster.sprite import MonsterSpriteHandler, SpriteLoader
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.session import local_session
 from tuxemon.ui.menu_options import MenuOptions
 
@@ -139,7 +138,7 @@ def open_journal(self, monster: MonsterModel) -> None:
         action.execute_action("clear_tuxepedia", [monster.slug], True)
 
     def update_animation_size(self) -> None:
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
         widgets_size = self.menu.get_size(widget=True)
 
         _width = widgets_size[0]

tuxemon/states/choice_npc.py

@@ -17,7 +17,6 @@
 from tuxemon.graphics import scale_surface
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.menu.theme import get_theme
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.ui.menu_options import MenuOptions
 
 if TYPE_CHECKING:
@@ -106,7 +105,7 @@ def add_npc_menu_item(
         self.menu.add.vertical_fill(self.config.vertical_fill)
 
     def update_animation_size(self) -> None:
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
         widgets_size = self.menu.get_size(widget=True)
 
         _width = widgets_size[0]

tuxemon/states/choice_state.py

@@ -10,7 +10,6 @@
 from tuxemon.animation import Animation, ScheduleType
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.menu.theme import get_theme
-from tuxemon.prepare import SCREEN_SIZE
 from tuxemon.ui.menu_options import MenuOptions
 
 if TYPE_CHECKING:
@@ -69,7 +68,7 @@ def __init__(
 
     def update_animation_size(self) -> None:
         widgets_size = self.menu.get_size(widget=True)
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
 
         _width = widgets_size[0]
         _height = widgets_size[1]

tuxemon/states/color_state.py

@@ -7,7 +7,6 @@
 from tuxemon.graphics import string_to_colorlike
 from tuxemon.menu.menu import PygameMenuState
 from tuxemon.menu.theme import get_theme
-from tuxemon.prepare import SCREEN_SIZE
 
 if TYPE_CHECKING:
     from tuxemon.base_client import BaseClient
@@ -26,7 +25,7 @@ def process_event(self, event: PlayerInput) -> PlayerInput | None:
         return None
 
     def __init__(self, client: BaseClient, color: str, **kwargs: Any) -> None:
-        width, height = SCREEN_SIZE
+        width, height = self.client.context.resolution
         _color = string_to_colorlike(color)
 
         super().__init__(client=client, height=height, width=width, **kwargs)