Skip to content

Commit bc2826c

Browse files
benfrybenfry
committed
let's call this 'zoom' instead, since it's not really dpi at all
1 parent 2a02ade commit bc2826c

8 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎app/src/processing/app/Settings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public Font getFont(String attr) {
205205
style |= Font.ITALIC;
206206
}
207207
int size = PApplet.parseInt(pieces[2], 12);
208-
size = Toolkit.dpi(size);
208+
size = Toolkit.zoom(size);
209209

210210
// replace bad font with the default from lib/preferences.txt
211211
if (replace) {

‎app/src/processing/app/syntax/TextAreaPainter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void updateAppearance() {
123123
Toolkit.getMonoFontName();
124124

125125
String fontFamily = Preferences.get("editor.font.family");
126-
int fontSize = Preferences.getInteger("editor.font.size");
126+
final int fontSize = Toolkit.zoom(Preferences.getInteger("editor.font.size"));
127127
plainFont = new Font(fontFamily, Font.PLAIN, fontSize);
128128
if (!fontFamily.equals(plainFont.getFamily())) {
129129
System.err.println(fontFamily + " not available, resetting to monospaced");

‎app/src/processing/app/ui/Editor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public abstract class Editor extends JFrame implements RunnerListener {
7878
protected EditorState state;
7979
protected Mode mode;
8080

81-
static public final int LEFT_GUTTER = Toolkit.dpi(44);
82-
static public final int RIGHT_GUTTER = Toolkit.dpi(12);
83-
static public final int GUTTER_MARGIN = Toolkit.dpi(3);
81+
static public final int LEFT_GUTTER = Toolkit.zoom(44);
82+
static public final int RIGHT_GUTTER = Toolkit.zoom(12);
83+
static public final int GUTTER_MARGIN = Toolkit.zoom(3);
8484

8585
protected MarkerColumn errorColumn;
8686

‎app/src/processing/app/ui/EditorButton.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
abstract public class EditorButton extends JComponent
3232
implements MouseListener, MouseMotionListener, ActionListener {
33-
static public final int DIM = Toolkit.dpi(30);
33+
static public final int DIM = Toolkit.zoom(30);
3434

3535
/** Button's description. */
3636
protected String title;

‎app/src/processing/app/ui/EditorHeader.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@
4444
*/
4545
public class EditorHeader extends JComponent {
4646
// height of this tab bar
47-
static final int HIGH = Toolkit.dpi(29);
47+
static final int HIGH = Toolkit.zoom(29);
4848

49-
static final int ARROW_TAB_WIDTH = Toolkit.dpi(18);
50-
static final int ARROW_TOP = Toolkit.dpi(11);
51-
static final int ARROW_BOTTOM = Toolkit.dpi(18);
52-
static final int ARROW_WIDTH = Toolkit.dpi(6);
49+
static final int ARROW_TAB_WIDTH = Toolkit.zoom(18);
50+
static final int ARROW_TOP = Toolkit.zoom(11);
51+
static final int ARROW_BOTTOM = Toolkit.zoom(18);
52+
static final int ARROW_WIDTH = Toolkit.zoom(6);
5353

54-
static final int CURVE_RADIUS = Toolkit.dpi(6);
54+
static final int CURVE_RADIUS = Toolkit.zoom(6);
5555

5656
static final int TAB_TOP = 0;
57-
static final int TAB_BOTTOM = Toolkit.dpi(27);
57+
static final int TAB_BOTTOM = Toolkit.zoom(27);
5858
// amount of extra space between individual tabs
59-
static final int TAB_BETWEEN = Toolkit.dpi(3);
59+
static final int TAB_BETWEEN = Toolkit.zoom(3);
6060
// amount of margin on the left/right for the text on the tab
61-
static final int TEXT_MARGIN = Toolkit.dpi(16);
61+
static final int TEXT_MARGIN = Toolkit.zoom(16);
6262
// width of the tab when no text visible
6363
// (total tab width will be this plus TEXT_MARGIN*2)
64-
static final int NO_TEXT_WIDTH = Toolkit.dpi(16);
64+
static final int NO_TEXT_WIDTH = Toolkit.zoom(16);
6565

6666
Color textColor[] = new Color[2];
6767
Color tabColor[] = new Color[2];
@@ -262,7 +262,7 @@ public void paintComponent(Graphics screen) {
262262
// can't be done with lines, b/c retina leaves tiny hairlines
263263
g.fillRect(Editor.LEFT_GUTTER, TAB_BOTTOM,
264264
editor.getTextArea().getWidth() - Editor.LEFT_GUTTER,
265-
Toolkit.dpi(2));
265+
Toolkit.zoom(2));
266266

267267
// draw the tab for the menu
268268
g.setColor(tabColor[UNSELECTED]);

‎app/src/processing/app/ui/EditorStatus.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
* Panel just below the editing area that contains status messages.
4848
*/
4949
public class EditorStatus extends BasicSplitPaneDivider { //JPanel {
50-
static final int HIGH = Toolkit.dpi(28);
50+
static final int HIGH = Toolkit.zoom(28);
5151
static final int LEFT_MARGIN = Editor.LEFT_GUTTER;
52-
static final int RIGHT_MARGIN = Toolkit.dpi(20);
52+
static final int RIGHT_MARGIN = Toolkit.zoom(20);
5353

5454
Color urlColor;
5555
Color[] fgColor;

‎app/src/processing/app/ui/EditorToolbar.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
abstract public class EditorToolbar extends JPanel implements KeyListener {
5353
// haven't decided how to handle this/how to make public/consistency
5454
// for components/does it live in theme.txt
55-
static final int HIGH = Toolkit.dpi(53);
55+
static final int HIGH = Toolkit.zoom(53);
5656
// horizontal gap between buttons
57-
static final int GAP = Toolkit.dpi(9);
57+
static final int GAP = Toolkit.zoom(9);
5858
// corner radius on the mode selector
59-
static final int RADIUS = Toolkit.dpi(3);
59+
static final int RADIUS = Toolkit.zoom(3);
6060

6161
protected Editor editor;
6262
protected Base base;
@@ -78,7 +78,7 @@ public EditorToolbar(Editor editor) {
7878
base = editor.getBase();
7979
mode = editor.getMode();
8080

81-
gradient = mode.makeGradient("toolbar", Toolkit.dpi(400), HIGH);
81+
gradient = mode.makeGradient("toolbar", Toolkit.zoom(400), HIGH);
8282

8383
rebuild();
8484
}
@@ -285,11 +285,11 @@ class ModeSelector extends JPanel {
285285
int titleAscent;
286286
int titleWidth;
287287

288-
final int MODE_GAP_WIDTH = Toolkit.dpi(13);
289-
final int ARROW_GAP_WIDTH = Toolkit.dpi(6);
290-
final int ARROW_WIDTH = Toolkit.dpi(6);
291-
final int ARROW_TOP = Toolkit.dpi(12);
292-
final int ARROW_BOTTOM = Toolkit.dpi(18);
288+
final int MODE_GAP_WIDTH = Toolkit.zoom(13);
289+
final int ARROW_GAP_WIDTH = Toolkit.zoom(6);
290+
final int ARROW_WIDTH = Toolkit.zoom(6);
291+
final int ARROW_TOP = Toolkit.zoom(12);
292+
final int ARROW_BOTTOM = Toolkit.zoom(18);
293293

294294
int[] triangleX = new int[3];
295295
int[] triangleY = new int[] { ARROW_TOP, ARROW_TOP, ARROW_BOTTOM };

‎app/src/processing/app/ui/Toolkit.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ static public void zoomSwingFonts() {
827827
*/
828828

829829

830-
static public int dpi(int pixels) {
830+
static public int zoom(int pixels) {
831831
return (int) (zoom * pixels);
832832
}
833833

@@ -845,7 +845,7 @@ static public void dpiStroke(Graphics2D g2) {
845845

846846

847847
static Dimension zoom(int w, int h) {
848-
return new Dimension(dpi(w), dpi(h));
848+
return new Dimension(zoom(w), zoom(h));
849849
}
850850

851851

0 commit comments

Comments
 (0)