ScrollPane/JScrollPane fixes for painted components needing paint()

hansonr · hansonr · commit 9259f6cfa7a8 · 2019-02-28T15:57:07.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java
@@ -1,57 +1,95 @@
 package swingjs.a2s;
 
+import java.awt.Adjustable;
+import java.awt.Color;
 import java.awt.Component;
+import java.awt.Point;
 
 import javax.swing.JScrollPane;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
 
 public class ScrollPane extends JScrollPane {
 
-  /**
-  * Specifies that horizontal/vertical scrollbar should be shown
-  * only when the size of the child exceeds the size of the scrollpane
-  * in the horizontal/vertical dimension.
-  */
- public static final int SCROLLBARS_AS_NEEDED = 0;
-
- /**
-  * Specifies that horizontal/vertical scrollbars should always be
-  * shown regardless of the respective sizes of the scrollpane and child.
-  */
- public static final int SCROLLBARS_ALWAYS = 1;
-
- /**
-  * Specifies that horizontal/vertical scrollbars should never be shown
-  * regardless of the respective sizes of the scrollpane and child.
-  */
- public static final int SCROLLBARS_NEVER = 2;
-
-	public void isAWT() {}
-	
+	/**
+	 * Specifies that horizontal/vertical scrollbar should be shown only when the
+	 * size of the child exceeds the size of the scrollpane in the
+	 * horizontal/vertical dimension.
+	 */
+	public static final int SCROLLBARS_AS_NEEDED = 0;
+
+	/**
+	 * Specifies that horizontal/vertical scrollbars should always be shown
+	 * regardless of the respective sizes of the scrollpane and child.
+	 */
+	public static final int SCROLLBARS_ALWAYS = 1;
+
+	/**
+	 * Specifies that horizontal/vertical scrollbars should never be shown
+	 * regardless of the respective sizes of the scrollpane and child.
+	 */
+	public static final int SCROLLBARS_NEVER = 2;
+
+	public void isAWT() {
+	}
+
 	public ScrollPane() {
-		super();
+        this(SCROLLBARS_AS_NEEDED);
 	}
-	
+
 	public ScrollPane(int scrollbars) {
 		super();
 		switch (scrollbars) {
 		case SCROLLBARS_NEVER:
-	    	setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_NEVER);
-	    	setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_NEVER);
-	    	break;			
+			setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_NEVER);
+			setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_NEVER);
+			break;
 		case SCROLLBARS_ALWAYS:
-	    	setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_ALWAYS);
-	    	setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_ALWAYS);
-	    	break;			
+			setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_ALWAYS);
+			setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_ALWAYS);
+			break;
 		case SCROLLBARS_AS_NEEDED:
-	    	break;			
+			break;
 		}
+		setBorder(new LineBorder(Color.black));
 	}
-	
+
 	@Override
 	public Component add(Component c) {
 		getViewport().add(c);
 		return c;
 	}
-	
-	
+
+	public Adjustable getVAdjustable() {
+		return getVerticalScrollBar();// vAdjustable;
+	}
+
+	public Adjustable getHAdjustable() {
+		return getHorizontalScrollBar();// hAdjustable;
+	}
+
+	public void setScrollPosition(int x, int y) {
+		synchronized (getTreeLock()) {
+			if (getComponentCount() == 0) {
+				throw new NullPointerException("child is null");
+			}
+			getHorizontalScrollBar().setValue(x);
+			getVerticalScrollBar().setValue(y);
+		}
+	}
+
+	public void setScrollPosition(Point p) {
+		setScrollPosition(p.x, p.y);
+	}
+
+	public Point getScrollPosition() {
+		synchronized (getTreeLock()) {
+			if (getComponentCount() == 0) {
+				throw new NullPointerException("child is null");
+			}
+			return new Point(getHorizontalScrollBar().getValue(), 
+					getVerticalScrollBar().getValue());
+		}
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollPaneUI.java
@@ -1249,6 +1249,9 @@ private void hsbStateChanged(JViewport viewport, ChangeEvent e) {
 
 		private void viewportStateChanged(ChangeEvent e) {
 			syncScrollPaneWithViewport();
+			// painted label, button, or canvas anywhere in the tree will need to be repainted after the shift in origin.
+			if (jc.selfOrChildIsPainted())
+				jc.repaint();
 		}
 
 		//

Original file line number	Diff line number	Diff line change
`@@ -1249,6 +1249,9 @@ private void hsbStateChanged(JViewport viewport, ChangeEvent e) {`
`1249`	`1249`
`1250`	`1250`	`private void viewportStateChanged(ChangeEvent e) {`
`1251`	`1251`	`syncScrollPaneWithViewport();`
	`1252`	`+ // painted label, button, or canvas anywhere in the tree will need to be repainted after the shift in origin.`
	`1253`	`+ if (jc.selfOrChildIsPainted())`
	`1254`	`+ jc.repaint();`
`1252`	`1255`	`}`
`1253`	`1256`
`1254`	`1257`	`//`