eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-11 17:40:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

excising nearly all AWT from PGraphics

Browse Source
This commit is contained in:
Ben Fry
2015-06-21 23:55:10 -04:00
parent e2e1b9477b
commit 44404f4062
6 changed files with 94 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,6 @@ public class PGraphicsJava2D extends PGraphics {
@Override
public PSurface createSurface() {
return surface = new PSurfaceAWT(this);
// return new PSurfaceAWT(this);
}
@@ -2066,9 +2065,43 @@ public class PGraphicsJava2D extends PGraphics {
}
@Override
public FontMetrics getFontMetrics(Font font) {
return (g2 != null) ? g2.getFontMetrics(font) : super.getFontMetrics(font);
// /**
// * Convenience method to get a legit FontMetrics object. Where possible,
// * override this any renderer subclass so that you're not using what's
// * returned by getDefaultToolkit() to get your metrics.
// */
// @SuppressWarnings("deprecation")
// public FontMetrics getFontMetrics(Font font) { // ignore
// Frame frame = parent.frame;
// if (frame != null) {
// return frame.getToolkit().getFontMetrics(font);
// }
// return Toolkit.getDefaultToolkit().getFontMetrics(font);
// }
//
//
// /**
// * Convenience method to jump through some Java2D hoops and get an FRC.
// */
// public FontRenderContext getFontRenderContext(Font font) { // ignore
// return getFontMetrics(font).getFontRenderContext();
// }
Toolkit toolkit;
@SuppressWarnings("deprecation")
protected FontMetrics getFontMetrics(Font font) {
if (toolkit == null) {
try {
Canvas canvas = (Canvas) surface.getNative();
toolkit = canvas.getToolkit();
} catch (Exception e) {
// May error out if it's a PSurfaceNone or similar
toolkit = Toolkit.getDefaultToolkit();
}
}
return toolkit.getFontMetrics(font);
//return (g2 != null) ? g2.getFontMetrics(font) : super.getFontMetrics(font);
}

5
core/src/processing/awt/PSurfaceAWT.java
View File

@@ -520,6 +520,11 @@ public class PSurfaceAWT extends PSurfaceNone {
}
// public Toolkit getToolkit() {
// return canvas.getToolkit();
// }
/** Set the window (and dock, or whatever necessary) title. */
@Override
public void setTitle(String title) {