Skip to content

Commit 353dedb

Browse files
benfrybenfry
committed
removing old resize images, no longer necessary.. also tweak code for new setup (issue processing#730)
1 parent bbb9f6e commit 353dedb

8 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎android/theme/resize.gif‎

-73 Bytes
Binary file not shown.

‎app/src/processing/app/EditorLineStatus.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public class EditorLineStatus extends JComponent {
3434
// JEditTextArea textarea;
3535
int start = -1, stop;
3636

37-
Image resize;
38-
3937
Color foreground;
4038
Color background;
4139
Font font;
@@ -62,10 +60,6 @@ public void updateMode() {
6260
font = mode.getFont("linestatus.font");
6361
foreground = mode.getColor("linestatus.color");
6462
high = mode.getInteger("linestatus.height");
65-
66-
if (Base.isMacOS()) {
67-
resize = mode.loadImage("theme/resize.gif");
68-
}
6963
}
7064

7165

@@ -101,10 +95,6 @@ public void paintComponent(Graphics g) {
10195
g.setColor(foreground);
10296
int baseline = (high + g.getFontMetrics().getAscent()) / 2;
10397
g.drawString(text, 6, baseline);
104-
105-
if (Base.isMacOS()) {
106-
g.drawImage(resize, size.width - 20, 0, this);
107-
}
10898
}
10999

110100

‎app/src/processing/app/Mode.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,10 @@ public void keyTyped(KeyEvent e) {
548548
});
549549

550550
tree.setBorder(new EmptyBorder(5, 5, 5, 5));
551-
JScrollPane treeView = new JScrollPane(tree);
552-
treeView.setPreferredSize(new Dimension(250, 450));
553-
examplesFrame.add(treeView);
551+
JScrollPane treePane = new JScrollPane(tree);
552+
treePane.setPreferredSize(new Dimension(250, 450));
553+
treePane.setBorder(new EmptyBorder(0, 0, 0, 0));
554+
examplesFrame.getContentPane().add(treePane);
554555
examplesFrame.pack();
555556
}
556557
// Space for the editor plus a li'l gap

‎build/build.xml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,24 @@
77
<condition property="linux"><os family="unix" /></condition>
88

99
<condition property="platform"
10-
value="macosx"><os family="mac" /></condition>
10+
value="macosx"><os family="mac" /> </condition>
1111
<condition property="platform"
12-
value="windows"><os family="windows" /></condition>
12+
value="windows"><os family="windows" /> </condition>
1313
<condition property="platform"
14-
value="linux"><os family="unix" /></condition>
14+
value="linux"><os family="unix" /> </condition>
15+
16+
<condition property="target.path"
17+
value="macosx/work/Processing.app/Contents/Resources/Java">
18+
<os family="mac" />
19+
</condition>
20+
21+
<condition property="target.path" value="linux/work">
22+
<os family="unix" />
23+
</condition>
24+
25+
<condition property="target.path" value="windows/work">
26+
<os family="windows" />
27+
</condition>
1528

1629
<!-- Libraries required for running processing -->
1730
<fileset dir=".." id="runtime.jars">
@@ -44,6 +57,7 @@
4457
<!-- ensure that the android-core.zip file has been built -->
4558
<available file="${target.path}/modes/android/android-core.zip"
4659
property="android-core-present" />
60+
<!--<echo message="${target.path}/modes/android/android-core.zip" />-->
4761
<fail unless="android-core-present"
4862
message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
4963
</target>

‎build/macosx/template.app/Contents/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<string>true</string>
9898

9999
<key>apple.awt.showGrowBox</key>
100-
<string>false</string>
100+
<string>true</string>
101101
<key>com.apple.smallTabs</key>
102102
<string>true</string>
103103
<key>apple.awt.Antialiasing</key>

‎java/theme/resize.gif‎

-92 Bytes
Binary file not shown.

‎javascript/theme/resize.gif‎

-92 Bytes
Binary file not shown.

‎todo.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ X make examples window respond to ESC
1717
X and double-click events to expand/collapse nodes
1818
X examples window placed off-screen when PDE window is maximized
1919
X http://code.google.com/p/processing/issues/detail?id=669
20+
X Resize box on OS X is not present in Examples box
21+
X http://code.google.com/p/processing/issues/detail?id=730
2022

2123
cleanup
2224
X how is autoformat doing? good now
@@ -37,6 +39,7 @@ o prevent people from setting the font size too small in the editor
3739
o how do we figure out what "too small" is?
3840
X -> everyone thinks this is funny
3941

42+
required for 0198 release
4043
_ automatically insert the 'import processing.opengl' when P3D used
4144
_ add support for automatically including OpenGL when asking for P3D
4245
_ when using P3D and not realizing that it's really OpenGL...
@@ -51,8 +54,6 @@ _ http://code.google.com/p/processing/issues/detail?id=688
5154
_ write quicktime uncompressed (w/o qtjava)
5255
_ http://www.randelshofer.ch/blog/2010/10/writing-quicktime-movies-in-pure-java/
5356

54-
_ Resize box on OS X is not present in Examples box
55-
_ http://code.google.com/p/processing/issues/detail?id=730
5657

5758
pnode: look more closely at json and xml compatibility
5859

0 commit comments

Comments
 (0)