Merge pull request #383 from ppizarror/fix-font-arg

Fix font argument as pygame.Font

Author: ppizarror

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2017-2021 Pablo Pizarro R. @ppizarror
+Copyright 2017 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"),

pygame_menu/__init__.py

@@ -115,7 +115,7 @@
     'zPaw'
 
 ]
-__copyright__ = 'Copyright 2017-2021 Pablo Pizarro R. @ppizarror'
+__copyright__ = 'Copyright 2017 Pablo Pizarro R. @ppizarror'
 __description__ = 'A menu for pygame. Simple, and easy to use'
 __email__ = '[email protected]'
 __keywords__ = 'pygame menu menus gui widget input button pygame-menu image sound ui'

pygame_menu/_widgetmanager.py

@@ -177,7 +177,7 @@ def _filter_widget_attributes(self, kwargs: Dict) -> Dict[str, Any]:
         # font_name
         font_name = kwargs.pop('font_name', self._theme.widget_font)
         assert_font(font_name)
-        attributes['font_name'] = str(font_name)
+        attributes['font_name'] = font_name
 
         # font_shadow
         font_shadow = kwargs.pop('font_shadow', self._theme.widget_font_shadow)

pygame_menu/version.py

@@ -34,6 +34,6 @@ def __str__(self) -> str:
     patch = property(lambda self: self[2])
 
 
-vernum = Version(4, 2, 3)
+vernum = Version(4, 2, 4)
 ver = str(vernum)
 rev = ''

setup.py

@@ -8,7 +8,7 @@
 License:
 -------------------------------------------------------------------------------
 The MIT License (MIT)
-Copyright 2017-2021 Pablo Pizarro R. @ppizarror
+Copyright 2017 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"),

test/test_font.py

@@ -11,6 +11,7 @@
 from pathlib import Path
 from test._utils import MenuUtils, BaseTest
 
+import pygame
 import pygame_menu
 
 
@@ -45,3 +46,18 @@ def test_system_load(self) -> None:
 
         # Modify the system font and load, this will raise an exception
         self.assertRaises(ValueError, lambda: MenuUtils.get_font('invalid font', 5))
+
+    def test_font_argument(self) -> None:
+        """
+        Test font pass as argument.
+        """
+        menu = MenuUtils.generic_menu()
+        f0 = pygame.font.SysFont(pygame.font.get_fonts()[0], 20)
+
+        # Widget with custom font
+        text = menu.add.text_input('First name: ', default='John', font_name=f0)
+        self.assertEqual(text.get_font_info()['name'], f0)
+
+        # Test widgets with default font, check are equal
+        text2 = menu.add.text_input('First name: ', default='John')
+        self.assertEqual(text2.get_font_info()['name'], menu.get_theme().widget_font)