Skip to content

Commit 0827d83

Browse files
BobHansonBobHanson
authored
Merge pull request #191 from BobHanson/master
2021 Feb/Mar updates
2 parents 02ead02 + 0fe5b83 commit 0827d83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1933
-916
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

6.66 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core-j11.jar‎

0 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20210115055921
1+
20210321064238

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/SwingJS-site.zip‎

4.54 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/net.sf.j2s.core-j11.jar‎

0 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20210115055845
1+
20210208070817

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip‎

6.66 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20210115055921
1+
20210321064238

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

6.66 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/Component.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,8 @@ private void reshapeNativePeer(int x, int y, int width, int height, int op) {
21482148
// nativeY += c.y;
21492149
// }
21502150
// peer.setBounds(nativeX, nativeY, width, height, op);
2151-
peer.setBounds(0, 0, width, height, op);
2151+
if (peer != null)
2152+
peer.setBounds(0, 0, width, height, op);
21522153
}
21532154

21542155
@SuppressWarnings("deprecation")
@@ -2411,8 +2412,7 @@ protected Dimension prefSizeComp() {
24112412
if (dim == null || !(isPreferredSizeSet() || isValid())) {
24122413
// synchronized (getTreeLock()) {
24132414
dim = (width != 0 || height != 0 ? null
2414-
: isDisplayable() ? //
2415-
// peer != null) ?
2415+
: isDisplayable() && peer != null ? //
24162416
peer.getPreferredSize() :
24172417
getMinimumSize());
24182418
prefSize = dim;

0 commit comments

Comments
 (0)