From 1be529f21fc67aed3a853505a8e49f4218002e78 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 20 Jan 2015 18:02:37 -0500 Subject: [PATCH] add items from the theme --- app/src/processing/app/Toolkit.java | 4 +++- {pdex => java}/theme/theme.txt | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename {pdex => java}/theme/theme.txt (100%) diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java index 18d0c0045..3c387175d 100644 --- a/app/src/processing/app/Toolkit.java +++ b/app/src/processing/app/Toolkit.java @@ -724,7 +724,9 @@ public class Toolkit { File fontFile = new File(System.getProperty("java.home"), "lib/fonts/" + filename); if (!fontFile.exists()) { // if we're debugging from Eclipse, grab it from the work folder (user.dir is /app) - fontFile = new File(System.getProperty("user.dir"), "../build/shared/lib/fonts/" + filename); + //fontFile = new File(System.getProperty("user.dir"), "../build/shared/lib/fonts/" + filename); + // if we're debugging Java Mode from Eclipse, user.dir is the work folder + fontFile = new File(System.getProperty("user.dir"), "../../build/shared/lib/fonts/" + filename); } BufferedInputStream input = new BufferedInputStream(new FileInputStream(fontFile)); Font font = Font.createFont(Font.TRUETYPE_FONT, input); diff --git a/pdex/theme/theme.txt b/java/theme/theme.txt similarity index 100% rename from pdex/theme/theme.txt rename to java/theme/theme.txt