List fix for AWT not updating scrollbar and not wrapped properly

BobHanson · BobHanson · commit 6448ca7bce64 · 2019-10-30T12:58:35.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Container.java b/sources/net.sf.j2s.java.core/src/java/awt/Container.java
@@ -1081,7 +1081,8 @@ protected void addImpl(Component comp, Object constraints, int index) {
 	protected void addImplCont(Component comp, Object constraints, int index) {
 		synchronized (getTreeLock()) {
 			
-			if (/** @j2sNative comp.getWrap$  && !this.isWrapper$ || */ false) {
+			// AWT a2s.List alone right now has getWrap
+			if (/** @j2sNative comp.秘getWrap$  && !this.秘isWrapper$ || */ false) {
 				comp = ((A2SWrappedComponent) comp).秘getWrap();
 				comp.background = comp.foreground = null; // this parent should not set the background color				
 			}
@@ -1262,7 +1263,7 @@ public void remove(int index) {
 	public void remove(Component comp) {
 		synchronized (getTreeLock()) {
 
-			if (/** @j2sNative comp.getWrap$ && !this.isWrapper$ || */ false) {
+			if (/** @j2sNative comp.秘getWrap$ && !this.秘isWrapper$ || */ false) {
 				comp = ((A2SWrappedComponent) comp).秘getWrap();
 			}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java
@@ -240,6 +240,8 @@ protected void fillDOM() {
 	 */
 	boolean isLeftToRight = true;
 
+	private boolean awtScrollPaneNeedsLayout;
+
 	/*
 	 * The bits below define JList property changes that affect layout. When one
 	 * of these properties changes we set a bit in updateLayoutStateNeeded. The
@@ -399,7 +401,6 @@ public void paint(Graphics g, JComponent c) {
 	}
 
 	private void paintImpl(Graphics g, JComponent c) {
-
 		// It is the responsibility of the JScrollPane scrollbar will move the JList
 		// to new x,y coordinates.
 
@@ -431,7 +432,6 @@ private void paintImpl(Graphics g, JComponent c) {
 		if ((renderer == null) || (size = dataModel.getSize()) == 0) {
 			return;
 		}
-
 		// Determine how many columns we need to paint
 		Rectangle paintBounds = g.getClipBounds();
 		int startColumn, endColumn;
@@ -477,6 +477,12 @@ private void paintImpl(Graphics g, JComponent c) {
 		rendererPane.removeAll();
 		// no -- this will paint the background over the painted backgrounds
 		// updateDOMNode();
+		if (awtScrollPaneNeedsLayout) {
+			awtScrollPaneNeedsLayout = false;
+			scrollPaneUI.jc.layout();
+		}
+
+
 	}
 
 //	private void paintDropLine(Graphics g) {
@@ -1422,6 +1428,8 @@ int convertModelToColumn(int index) {
 	 */
 	protected void maybeUpdateLayoutState() {
 		if (updateLayoutStateNeeded != 0) {
+			if (isAWT && scrollPaneUI != null)
+				awtScrollPaneNeedsLayout = true;
 			updateLayoutStateNeeded = 0; // SwingJS switch of order here for getting
 																		// actual size
 			updateLayoutState();
