Merge pull request #19 from beeware/system-font-size

Add support for system-size font definitions.
beeware · May 25, 2020 · 8681cc7 · 8681cc7
2 parents cecbca9 + 8495b5f
commit 8681cc7
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 9 deletions.
diff --git a/changes/19.feature.rst b/changes/19.feature.rst
@@ -0,0 +1 @@
+Added support for delaring a system default font size.
diff --git a/setup.cfg b/setup.cfg
@@ -29,10 +29,11 @@ long_description_content_type = text/x-rst
 [options]
 python_requires = >= 3.5
 packages = find:
+package_dir =
+    = src
 
 [options.packages.find]
-include =
-    travertino
+where = src
 
 [flake8]
 exclude=
@@ -55,5 +56,5 @@ ignore = E133,E226,W503
 combine_as_imports = true
 include_trailing_comma = true
 line_length = 79
-multi_line_output = 5
+multi_line_output = 3
 not_skip = __init__.py
diff --git a/travertino/__init__.py → src/travertino/__init__.py b/travertino/__init__.py → src/travertino/__init__.py
diff --git a/travertino/colors.py → src/travertino/colors.py b/travertino/colors.py → src/travertino/colors.py
diff --git a/travertino/constants.py → src/travertino/constants.py b/travertino/constants.py → src/travertino/constants.py
@@ -75,6 +75,12 @@
 
 FONT_WEIGHTS = {BOLD}
 
+######################################################################
+# Font Size
+######################################################################
+
+SYSTEM_DEFAULT_FONT_SIZE = -1
+
 ######################################################################
 # Colors
 ######################################################################

diff --git a/travertino/declaration.py → src/travertino/declaration.py b/travertino/declaration.py → src/travertino/declaration.py
diff --git a/travertino/fonts.py → src/travertino/fonts.py b/travertino/fonts.py → src/travertino/fonts.py
@@ -1,6 +1,13 @@
 from .constants import (
-    NORMAL, FONT_STYLES, FONT_VARIANTS, FONT_WEIGHTS,
-    ITALIC, OBLIQUE, SMALL_CAPS, BOLD
+    BOLD,
+    FONT_STYLES,
+    FONT_VARIANTS,
+    FONT_WEIGHTS,
+    ITALIC,
+    NORMAL,
+    OBLIQUE,
+    SMALL_CAPS,
+    SYSTEM_DEFAULT_FONT_SIZE,
 )
 
 
@@ -29,11 +36,11 @@ def __hash__(self):
         return hash(('FONT', self.family, self.size, self.style, self.variant, self.weight))
 
     def __repr__(self):
-        return '<Font: {}{}{}{}pt {}>'.format(
+        return '<Font: {}{}{}{} {}>'.format(
             '' if self.style is NORMAL else (self.style + ' '),
             '' if self.variant is NORMAL else (self.variant + ' '),
             '' if self.weight is NORMAL else (self.weight + ' '),
-            self.size,
+            'system default size' if self.size == SYSTEM_DEFAULT_FONT_SIZE else '{}pt'.format(self.size),
             self.family
         )
 

diff --git a/travertino/layout.py → src/travertino/layout.py b/travertino/layout.py → src/travertino/layout.py
diff --git a/travertino/node.py → src/travertino/node.py b/travertino/node.py → src/travertino/node.py
diff --git a/travertino/size.py → src/travertino/size.py b/travertino/size.py → src/travertino/size.py
diff --git a/tests/test_font.py b/tests/test_font.py
@@ -1,7 +1,14 @@
 from unittest import TestCase
 
-from travertino.constants import NORMAL, ITALIC, OBLIQUE, SMALL_CAPS, BOLD
-from travertino.fonts import font, Font
+from travertino.constants import (
+    BOLD,
+    ITALIC,
+    NORMAL,
+    OBLIQUE,
+    SMALL_CAPS,
+    SYSTEM_DEFAULT_FONT_SIZE,
+)
+from travertino.fonts import Font, font
 
 
 class FontTests(TestCase):
@@ -65,6 +72,17 @@ def test_repr(self):
             '<Font: italic bold 12pt Comic Sans>'
         )
 
+        # Check system default size handling
+        self.assertEqual(
+            repr(Font('Comic Sans', SYSTEM_DEFAULT_FONT_SIZE)),
+            '<Font: system default size Comic Sans>'
+        )
+
+        self.assertEqual(
+            repr(Font('Comic Sans', SYSTEM_DEFAULT_FONT_SIZE, style=ITALIC)),
+            '<Font: italic system default size Comic Sans>'
+        )
+
     def test_simple_construction(self):
         # Simplest case
         self.assertFont(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Added support for delaring a system default font size.