eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2338 from GKFX/patch-4

Browse Source 
Allow textWidth() with the default font.
This commit is contained in:
Ben Fry
2014-05-10 17:09:21 -04:00
parent 026a26a1c2 c3e7042fe3
commit c0b4f28cfe
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/core/PGraphicsJava2D.java
+6 -2
View File
@@ -1582,7 +1582,7 @@ public class PGraphicsJava2D extends PGraphics {
@Override
public float textDescent() {
if (textFont == null) {
defaultFontOrDeath("textAscent");
defaultFontOrDeath("textDescent");
}
Font font = (Font) textFont.getNative();
//if (font != null && (textFont.isStream() || hints[ENABLE_NATIVE_FONTS])) {
@@ -1621,7 +1621,7 @@ public class PGraphicsJava2D extends PGraphics {
@Override
public void textSize(float size) {
if (textFont == null) {
defaultFontOrDeath("textAscent", size);
defaultFontOrDeath("textSize", size);
}
// if a native version available, derive this font
@@ -1668,6 +1668,10 @@ public class PGraphicsJava2D extends PGraphics {
@Override
protected float textWidthImpl(char buffer[], int start, int stop) {
if (textFont == null) {
defaultFontOrDeath("textWidth");
}
Font font = (Font) textFont.getNative();
//if (font != null && (textFont.isStream() || hints[ENABLE_NATIVE_FONTS])) {
if (font != null) {