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

working on font options and prefs

Browse Source
This commit is contained in:
Ben Fry
2013-10-13 13:18:45 -04:00
parent 3f326e994b
commit bc3b191de9
6 changed files with 142 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/EditorConsole.java
+1
View File
@@ -176,6 +176,7 @@ public class EditorConsole extends JScrollPane {
consoleDoc.setParagraphAttributes(0, 0, standard, true);
Font font = Preferences.getFont("console.font");
//Font font = Toolkit.getMonoFont(size, style);
// build styles for different types of console output
Color bgColor = mode.getColor("console.color");
app/src/processing/app/Preferences.java
+83 -20
View File
@@ -26,6 +26,7 @@ import java.awt.*;
import java.awt.event.*;
import java.io.*;
import java.util.*;
import java.util.List;
import javax.swing.*;
@@ -116,15 +117,18 @@ public class Preferences {
JTextField fontSizeField;
JCheckBox inputMethodBox;
JCheckBox autoAssociateBox;
//JRadioButton bitsThirtyTwoButton;
//JRadioButton bitsSixtyFourButton;
JComboBox displaySelectionBox;
int displayCount;
//List<Font> monoFontList;
Font[] monoFontList;
JComboBox fontSelectionBox;
// the calling editor, so updates can be applied
// Editor editor;
/** Base object so that updates can be applied to the list of editors. */
Base base;
@@ -294,6 +298,39 @@ public class Preferences {
top += vmax + GUI_BETWEEN;
// Editor and console font [ Source Code Pro ]
// Nevermind on this for now.. Java doesn't seem to have a method for
// enumerating only the fixed-width (monospaced) fonts. To do this
// properly, we'd need to list the fonts, and compare the metrics of
// i and M for each. When they're identical (and not degenerate),
// we'd call that font fixed width. That's all a very expensive set of
// operations, so it should also probably be cached between runs and
// updated in the background.
Container fontBox = Box.createHorizontalBox();
JLabel fontLabel = new JLabel("Editor and Console font ");
final String fontTip = "<html>" +
"Select the font used in the Editor and the Console.<br/>" +
"Only monospaced (fixed-width) fonts may be used, <br/>" +
"though the list may be imperfect.";
fontLabel.setToolTipText(fontTip);
fontBox.add(fontLabel);
// needs to happen here for getPreferredSize()
fontSelectionBox = new JComboBox(new Object[] { Toolkit.getMonoFontName() });
fontSelectionBox.setToolTipText(fontTip);
// fontSelectionBox.addItem(Toolkit.getMonoFont(size, style));
//updateDisplayList();
fontSelectionBox.setEnabled(false); // don't enable until fonts are loaded
fontBox.add(fontSelectionBox);
// fontBox.add(Box.createHorizontalGlue());
pain.add(fontBox);
d = fontBox.getPreferredSize();
fontBox.setBounds(left, top, d.width + 150, d.height);
// fontBox.setBounds(left, top, dialog.getWidth() - left*2, d.height);
top += d.height + GUI_BETWEEN;
// Editor font size [ ]
Container box = Box.createHorizontalBox();
@@ -310,23 +347,7 @@ public class Preferences {
fontSizeField.setText(String.valueOf(editorFont.getSize()));
top += d.height + GUI_BETWEEN;
// Nevermind on this for now.. Java doesn't seem to have a method for
// enumerating only the fixed-width (monospaced) fonts. To do this
// properly, we'd need to list the fonts, and compare the metrics of
// i and M for each. When they're identical (and not degenerate),
// we'd call that font fixed width. That's all a very expensive set of
// operations, so it should also probably be cached between runs and
// updated in the background.
// // Editor font
//
// GraphicsEnvironment ge =
// GraphicsEnvironment.getLocalGraphicsEnvironment();
// Font fonts[] = ge.getAllFonts();
// ArrayList<Font> monoFonts = new ArrayList<Font>();
// [ ] Use smooth text in editor window
editorAntialiasBox =
@@ -754,6 +775,15 @@ public class Preferences {
// System.out.println("setting num to " + displayNum);
displaySelectionBox.setSelectedIndex(displayNum);
}
new Thread(new Runnable() {
public void run() {
initFontList();
// while (monoFontList == null) {
// System.out.println("Waiting for font list to finish loading...");
// }
}
}).start();
memoryOverrideBox.
setSelected(getBoolean("run.options.memory")); //$NON-NLS-1$
@@ -785,6 +815,39 @@ public class Preferences {
}
/**
* I have some ideas on how we could make Swing even more obtuse for the
* most basic usage scenarios. Is there someone on the team I can contact?
* Oracle, are you listening?
*/
class FontNamer extends JLabel implements ListCellRenderer<Font> {
public Component getListCellRendererComponent(JList<? extends Font> list,
Font value, int index,
boolean isSelected,
boolean cellHasFocus) {
setText(value.getName());
return this;
}
}
void initFontList() {
if (monoFontList == null) {
Font[] list = Toolkit.getMonoFontList().toArray(new Font[0]);
fontSelectionBox.setModel(new DefaultComboBoxModel(list));
fontSelectionBox.setRenderer(new FontNamer());
// Preferred size just makes it extend to the container
//fontSelectionBox.setSize(fontSelectionBox.getPreferredSize());
// Minimum size is better, but cuts things off (on OS X), so we add 20
//Dimension minSize = fontSelectionBox.getMinimumSize();
//Dimension minSize = fontSelectionBox.getPreferredSize();
//fontSelectionBox.setSize(minSize.width + 20, minSize.height);
fontSelectionBox.setEnabled(true);
monoFontList = list; // signal that we're finished
}
}
void updateDisplayList() {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
displayCount = ge.getScreenDevices().length;
app/src/processing/app/Toolkit.java
+46
View File
@@ -36,12 +36,14 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.font.FontRenderContext;
import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JCheckBoxMenuItem;
@@ -320,12 +322,56 @@ public class Toolkit {
// }
static public List<Font> getMonoFontList() {
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
Font[] fonts = ge.getAllFonts();
ArrayList<Font> outgoing = new ArrayList<Font>();
// Using AffineTransform.getScaleInstance(100, 100) doesn't change sizes
FontRenderContext frc =
new FontRenderContext(new AffineTransform(),
Preferences.getBoolean("editor.antialias"),
true); // use fractional metrics
for (Font font : fonts) {
if (font.canDisplay('i') && font.canDisplay('M') &&
font.canDisplay(' ') && font.canDisplay('.')) {
// The old method just returns 1 or 0, and using deriveFont(size)
// is overkill. It also causes deprecation warnings
// @SuppressWarnings("deprecation")
// FontMetrics fm = awtToolkit.getFontMetrics(font);
//FontMetrics fm = awtToolkit.getFontMetrics(font.deriveFont(24));
// System.out.println(fm.charWidth('i') + " " + fm.charWidth('M'));
// if (fm.charWidth('i') == fm.charWidth('M') &&
// fm.charWidth('M') == fm.charWidth(' ') &&
// fm.charWidth(' ') == fm.charWidth('.')) {
double w = font.getStringBounds(" ", frc).getWidth();
if (w == font.getStringBounds("i", frc).getWidth() &&
w == font.getStringBounds("M", frc).getWidth() &&
w == font.getStringBounds(".", frc).getWidth()) {
outgoing.add(font);
// System.out.println(" good " + w);
}
}
}
return outgoing;
}
static Font monoFont;
static Font monoBoldFont;
static Font sansFont;
static Font sansBoldFont;
static public String getMonoFontName() {
if (monoFont == null) {
getMonoFont(12, Font.PLAIN); // load a dummy version
}
return monoFont.getName();
}
static public Font getMonoFont(int size, int style) {
if (monoFont == null) {
try {
app/src/processing/app/tools/CreateFont.java
+3 -1
View File
@@ -112,9 +112,11 @@ public class CreateFont extends JFrame implements Tool {
// also ignore dialog, dialoginput, monospaced, serif, sansserif
// getFontList is deprecated in 1.4, so this has to be used
//long t = System.currentTimeMillis();
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
Font fonts[] = ge.getAllFonts();
Font[] fonts = ge.getAllFonts();
//System.out.println("font startup took " + (System.currentTimeMillis() - t) + " ms");
if (false) {
ArrayList<Font> fontList = new ArrayList<Font>();
build/build.xml
+7
View File
@@ -592,6 +592,13 @@
<fileset file="shared/revisions.txt" />
</copy>
<!--
Processing.app/Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/lib/fonts
<copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/lib/fonts">
<fileset dir="shared/lib/fonts" includes="*" />
</copy>
-->
<property name="launch4j.dir"
value="macosx/work/Processing.app/Contents/Java/launch4j" />
todo.txt
+2
View File
@@ -71,6 +71,8 @@ _ dialog box icon is fuzzy on OS X retina machines
_ https://github.com/processing/processing/issues/2117
_ solution might be our own dialog boxes (see 'dialogs' section)
_ console font in EditorConsole
_ Font font = Preferences.getFont("console.font");
_ fix console font on Windows and Linux with 7u40
_ the message area text also looks ugly.. can we fix?
_ add pref to select PDE font (so that CJKV languages work better)