Skip to content

use non deprecated font families styles etc #806

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
aaronayres35 merged 1 commit into from
Apr 29, 2021
+25 −17
Merged

use non deprecated font families styles etc #806

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
42 changes: 25 additions & 17 deletions kiva/trait_defs/ui/wx/kiva_font_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,20 @@ def to_wx_font(self, editor):
import kiva.constants as kc

font = editor.value
weight = (wx.NORMAL, wx.BOLD)[font.weight == kc.BOLD]
style = (wx.NORMAL, wx.ITALIC)[font.style == kc.ITALIC]
weight = (
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD
)[font.weight == kc.BOLD]
Comment thread
aaronayres35 marked this conversation as resolved.
style = (
wx.FONTSTYLE_NORMAL, wx.FONTSTYLE_ITALIC
)[font.style == kc.ITALIC]
family = {
kc.DEFAULT: wx.DEFAULT,
kc.DECORATIVE: wx.DECORATIVE,
kc.ROMAN: wx.ROMAN,
kc.SCRIPT: wx.SCRIPT,
kc.SWISS: wx.SWISS,
kc.MODERN: wx.MODERN,
}.get(font.family, wx.SWISS)
kc.DEFAULT: wx.FONTFAMILY_DEFAULT,
kc.DECORATIVE: wx.FONTFAMILY_DECORATIVE,
kc.ROMAN: wx.FONTFAMILY_ROMAN,
kc.SCRIPT: wx.FONTFAMILY_SCRIPT,
kc.SWISS: wx.FONTFAMILY_SWISS,
kc.MODERN: wx.FONTFAMILY_MODERN,
}.get(font.family, wx.FONTFAMILY_SWISS)

return wx.Font(
font.size,
Expand All @@ -84,15 +88,19 @@ def from_wx_font(self, font):
return Font(
size=font.GetPointSize(),
family={
wx.DEFAULT: kc.DEFAULT,
wx.DECORATIVE: kc.DECORATIVE,
wx.ROMAN: kc.ROMAN,
wx.SCRIPT: kc.SCRIPT,
wx.SWISS: kc.SWISS,
wx.MODERN: kc.MODERN,
wx.FONTFAMILY_DEFAULT: kc.DEFAULT,
wx.FONTFAMILY_DECORATIVE: kc.DECORATIVE,
wx.FONTFAMILY_ROMAN: kc.ROMAN,
wx.FONTFAMILY_SCRIPT: kc.SCRIPT,
wx.FONTFAMILY_SWISS: kc.SWISS,
wx.FONTFAMILY_MODERN: kc.MODERN,
}.get(font.GetFamily(), kc.SWISS),
weight=(kc.NORMAL, kc.BOLD)[font.GetWeight() == wx.BOLD],
style=(kc.NORMAL, kc.ITALIC)[font.GetStyle() == wx.ITALIC],
weight=(
kc.NORMAL, kc.BOLD
)[font.GetWeight() == wx.FONTWEIGHT_BOLD],
style=(
kc.NORMAL, kc.ITALIC
)[font.GetStyle() == wx.FONTSTYLE_ITALIC],
underline=font.GetUnderlined() - 0, # convert Bool to an int type
face_name=font.GetFaceName(),
)
Expand Down