fix for Component JPanel minimumSize (1,1)

hansonr · hansonr · commit 9e8f5ecf3a4d · 2020-07-22T18:51:32.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -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;
 			// }
 		}
@@ -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));
 	}
 
 	/**
