Skip to content

Render font families better in QPainter backend #973

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

Merged
corranwebster merged 2 commits into from
Aug 8, 2022
Merged

Render font families better in QPainter backend #973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498a3c9
Fall back to kiva.fonttools if Qt can't come up with a font name.
corranwebster Aug 4, 2022
dc824f7
Add a comment about setFamilies()
corranwebster Aug 8, 2022
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
31 changes: 28 additions & 3 deletions kiva/qpainter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@
draw_modes[constants.FILL_STROKE] = QtCore.Qt.OddEvenFill
draw_modes[constants.EOF_FILL_STROKE] = QtCore.Qt.WindingFill

font_family_to_style_hint = {
constants.DEFAULT: QtGui.QFont.StyleHint.AnyStyle,
constants.SWISS: QtGui.QFont.StyleHint.SansSerif,
constants.ROMAN: QtGui.QFont.StyleHint.Serif,
constants.MODERN: QtGui.QFont.StyleHint.Monospace,
constants.TELETYPE: QtGui.QFont.StyleHint.TypeWriter,
constants.DECORATIVE: QtGui.QFont.StyleHint.Decorative,
constants.SCRIPT: QtGui.QFont.StyleHint.Cursive,
}

font_styles = {}
font_styles["regular"] = constants.NORMAL
font_styles["bold"] = constants.NORMAL
Expand Down Expand Up @@ -649,13 +659,28 @@ def select_font(self, name, size, style="regular", encoding=None):
def set_font(self, font):
""" Set the font for the current graphics context.
"""
qfont = QtGui.QFont(font.face_name, font.size)

qfont = QtGui.QFont()
qfont.setStyleHint(font_family_to_style_hint[font.family])
qfont.setPointSizeF(font.size)
weight = font._get_weight()
qfont.setWeight(weight_to_qt_weight[weight])

qfont.setItalic(font.style in constants.italic_styles)

if font.face_name:
name = font.face_name
else:
# if we don't have a face name, see if Qt can suggest one
name = qfont.defaultFamily()
if not name:
# otherwise use kiva.fonttools to suggest one
name = font.findfontname()

# setFamilies() was introduced in Qt 5.13
if hasattr(qfont, 'setFamilies'):
Copy link
Copy Markdown
Member

@jwiggins jwiggins Aug 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a note here that the method was introduced in Qt 5.13 would be helpful?

qfont.setFamilies([name])
else:
qfont.setFamily(name)

self.gc.setFont(qfont)

def set_font_size(self, size):
Expand Down