Skip to content

Add sysfont for textbox function of SurfacePainter #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RonTang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add sysfont for textbox function of SurfacePainter #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pgzero/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@ def getfont(
and so on.

"""
if fontname is not None and sysfontname is not None:
raise ValueError("Can't set both fontname and sysfontname")

fontname = fontname or ptext.DEFAULT_FONT_NAME
fontsize = fontsize or ptext.DEFAULT_FONT_SIZE

Expand All @@ -262,8 +265,9 @@ def getfont(

if key in ptext._font_cache:
return ptext._font_cache[key]

if fontname is None:
if sysfontname is not None:
font = pygame.font.SysFont(sysfontname, fontsize)
elif fontname is None:
font = ptext._font_cache.get(key)
if font:
return font
Expand Down
2 changes: 1 addition & 1 deletion pgzero/ptext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ def drawbox(text, rect, fontname=None, sysfontname=None, lineheight=None, anchor
y = rect.y + vanchor * rect.height
fontsize = _fitsize(text, fontname, sysfontname, bold, italic, underline,
rect.width, rect.height, lineheight, strip)
return draw(text, (x, y), fontname=fontname, fontsize=fontsize, lineheight=lineheight,
return draw(text, (x, y), fontname=fontname, sysfontname=sysfontname, fontsize=fontsize, lineheight=lineheight,
width=rect.width, strip=strip, anchor=anchor, **kwargs)


Expand Down