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

getting font metrics from default toolkit

Browse Source
This commit is contained in:
codeanticode
2014-11-17 09:54:52 -07:00
parent 97ff4895d8
commit 2ad7d2ab21
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/processing/opengl/PJOGL.java
View File

@@ -3,7 +3,6 @@ package processing.opengl;
import java.awt.Canvas;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.Toolkit;
import java.awt.font.FontRenderContext;
@@ -1196,7 +1195,6 @@ public class PJOGL extends PGL {
@Override
protected int getFontAscent(Font font) {
//FontMetrics metrics = pg.parent.getFontMetrics(font);
@SuppressWarnings("deprecation")
FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
return metrics.getAscent();
@@ -1204,18 +1202,18 @@ public class PJOGL extends PGL {
protected int getFontDescent(Object font) {
FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics((Font)font);
// FontMetrics metrics = pg.parent.getFontMetrics((Font)font);
// return metrics.getDescent();
return 0;
return metrics.getDescent();
}
protected int getTextWidth(Object font, char buffer[], int start, int stop) {
// maybe should use one of the newer/fancier functions for this?
// int length = stop - start;
int length = stop - start;
// FontMetrics metrics = pg.parent.getFontMetrics((Font)font);
// return metrics.charsWidth(buffer, start, length);
return 0;
FontMetrics metrics = Toolkit.getDefaultToolkit().getFontMetrics((Font)font);
return metrics.charsWidth(buffer, start, length);
}
@@ -1399,8 +1397,8 @@ public class PJOGL extends PGL {
public FontOutline(char ch, Object font) {
char textArray[] = new char[] { ch };
Graphics2D graphics = (Graphics2D) pg.parent.frame.getGraphics();
FontRenderContext frc = graphics.getFontRenderContext();
// Graphics2D graphics = (Graphics2D) pg.parent.frame.getGraphics();
FontRenderContext frc = pg.getFontRenderContext((Font)font);
GlyphVector gv = ((Font)font).createGlyphVector(frc, textArray);
Shape shp = gv.getOutline();
iter = shp.getPathIterator(null);