Thanks to visit codestin.com
Credit goes to github.com

Skip to content

July 14-28 work #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200713172416
20200728062204
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200713172416
20200728062204
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
Binary file not shown.
13 changes: 4 additions & 9 deletions sources/net.sf.j2s.java.core/src/java/awt/Component.java
Original file line number Diff line number Diff line change
Expand Up @@ -2475,12 +2475,10 @@ public Dimension minimumSize() {
* Avoid grabbing the lock if a reasonable cached size value is available.
*/
Dimension dim = minSize;
if (dim == null || !(isMinimumSizeSet() || isValid())) {
if (dim == null || !isMinimumSizeSet() && !isValid()) {
// synchronized (getTreeLock()) {
minSize =
// (peer != null) ?
// peer.minimumSize() :
size();
// SwingJS: NullComponentPeer would have returned (1,1)
minSize = (peer == null ? size() : new Dimension(1,1));
dim = minSize;
// }
}
Expand Down Expand Up @@ -2538,10 +2536,7 @@ public Dimension getMaximumSize() {
}

protected Dimension getMaxSizeComp() {
if (isMaximumSizeSet()) {
return new Dimension(maxSize);
}
return new Dimension(Short.MAX_VALUE, Short.MAX_VALUE);
return (isMaximumSizeSet() ? maxSize : new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ public BufferedImage createCompatibleImage(int width, int height,
}


protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,
boolean alphaPremultiplied, Hashtable<?, ?> properties) {
return new BufferedImage(cm, wr, alphaPremultiplied, properties);
protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr, boolean alphaPremultiplied,
Hashtable<?, ?> properties) {
BufferedImage bi = new BufferedImage(cm, wr, alphaPremultiplied, properties);
bi.getRaster().秘setStable(true);
return bi;
}

/**
Expand Down
Loading