diff --git a/README.md b/README.md index 27d2be4..124b6bf 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ typeface = pixie.read_typeface("examples/data/Ubuntu-Regular_1.ttf") def make_font(typeface, size, color): font = typeface.new_font() font.size = size - font.paints[0].color = color + font.paint.color = color return font spans = pixie.SeqSpan() diff --git a/examples/blur.png b/examples/blur.png index a56cd1b..09279df 100644 Binary files a/examples/blur.png and b/examples/blur.png differ diff --git a/examples/shadow.png b/examples/shadow.png index c76d209..b6d3532 100644 Binary files a/examples/shadow.png and b/examples/shadow.png differ diff --git a/examples/text_spans.py b/examples/text_spans.py index 46be1bd..a1e3645 100644 --- a/examples/text_spans.py +++ b/examples/text_spans.py @@ -8,7 +8,7 @@ def make_font(typeface, size, color): font = typeface.new_font() font.size = size - font.paints[0].color = color + font.paint.color = color return font spans = pixie.SeqSpan() diff --git a/setup.py b/setup.py index 4063d62..7dc924f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name = "pixie-python", - version = "0.1.5", + version = "3.0.2", author = "Andre von Houck", author_email = "starplant@gmail.com", description = "Python bindings for Pixie, a full-featured 2D graphics library", diff --git a/src/pixie/libpixie.so b/src/pixie/libpixie.so index df0f512..384fdaa 100755 Binary files a/src/pixie/libpixie.so and b/src/pixie/libpixie.so differ diff --git a/src/pixie/pixie.dll b/src/pixie/pixie.dll index ee109ab..3789c5a 100644 Binary files a/src/pixie/pixie.dll and b/src/pixie/pixie.dll differ diff --git a/src/pixie/pixie.py b/src/pixie/pixie.py index 9224d7d..7ee1ce4 100644 --- a/src/pixie/pixie.py +++ b/src/pixie/pixie.py @@ -1207,6 +1207,14 @@ def clear(self): def paints(self): return self.FontPaints(self) + @property + def paint(self): + return dll.pixie_font_get_paint(self) + + @paint.setter + def paint(self, paint): + dll.pixie_font_set_paint(self, paint) + @property def text_case(self): return dll.pixie_font_get_text_case(self) @@ -2310,6 +2318,12 @@ def inverse(m): dll.pixie_font_paints_clear.argtypes = [Font] dll.pixie_font_paints_clear.restype = None +dll.pixie_font_get_paint.argtypes = [Font] +dll.pixie_font_get_paint.restype = Paint + +dll.pixie_font_set_paint.argtypes = [Font, Paint] +dll.pixie_font_set_paint.restype = None + dll.pixie_font_get_text_case.argtypes = [Font] dll.pixie_font_get_text_case.restype = TextCase diff --git a/tests/images/blur.png b/tests/images/blur.png index 2adec6c..3c4fc1b 100644 Binary files a/tests/images/blur.png and b/tests/images/blur.png differ diff --git a/tests/images/shadow.png b/tests/images/shadow.png index c359889..0318e65 100644 Binary files a/tests/images/shadow.png and b/tests/images/shadow.png differ diff --git a/tests/masks/blur.png b/tests/masks/blur.png index 008b935..a9fc6df 100644 Binary files a/tests/masks/blur.png and b/tests/masks/blur.png differ diff --git a/tests/test_font.py b/tests/test_font.py index 6d6f607..5862c8e 100644 --- a/tests/test_font.py +++ b/tests/test_font.py @@ -15,6 +15,10 @@ def test_fields(): assert font.strikethrough font.no_kerning_adjustment = True assert font.no_kerning_adjustment + paint = pixie.Paint(pixie.PK_SOLID) + paint.color = pixie.Color(1, 1, 0, 1) + font.paint = paint + assert font.paint.color == paint.color def test_paints(): font = pixie.read_font("tests/fonts/Roboto-Regular_1.ttf")