eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 10:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't derive the font again if the size is unchanged (#4956)

Browse Source
This commit is contained in:
Ben Fry
2017-03-12 09:59:12 -04:00
parent 65276a3185
commit c8c4539204
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/processing/awt/PGraphicsJava2D.java
View File

@@ -1908,14 +1908,9 @@ public class PGraphicsJava2D extends PGraphics {
@Override
protected void handleTextSize(float size) {
// if a native version available, derive this font
// if (textFontNative != null) {
// textFontNative = textFontNative.deriveFont(size);
// g2.setFont(textFontNative);
// textFontNativeMetrics = g2.getFontMetrics(textFontNative);
// }
Font font = (Font) textFont.getNative();
//if (font != null && (textFont.isStream() || hints[ENABLE_NATIVE_FONTS])) {
if (font != null) {
// don't derive again if the font size has not changed
if (font != null && font.getSize2D() != size) {
Map<TextAttribute, Object> map =
new HashMap<TextAttribute, Object>();
map.put(TextAttribute.SIZE, size);
@@ -1928,13 +1923,12 @@ public class PGraphicsJava2D extends PGraphics {
textFont.setNative(font);
fontObject = font;
// Font dfont = font.deriveFont(size);
//// Map<TextAttribute, ?> attrs = dfont.getAttributes();
//// for (TextAttribute ta : attrs.keySet()) {
//// System.out.println(ta + " -> " + attrs.get(ta));
//// }
// g2.setFont(dfont);
// textFont.setNative(dfont);
/*
Map<TextAttribute, ?> attrs = font.getAttributes();
for (TextAttribute ta : attrs.keySet()) {
System.out.println(ta + " -> " + attrs.get(ta));
}
*/
}
// take care of setting the textSize and textLeading vars