JScrollbar/JSlider fix for UI/class notification infinite loop

hansonr · hansonr · commit 940d5be922a0 · 2018-11-19T15:32:40.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20181118005502 
+20181119153133 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181118005502 
+20181119153133 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/Timer.java b/sources/net.sf.j2s.java.core/src/javax/swing/Timer.java
@@ -555,7 +555,7 @@ private ArrayList<Object> timerQueue() {
 	public void restart() {
 		// getLock().lock();
 		// try {
-		// stop();
+	    stop();
 		start();
 		// } finally {
 		// getLock().unlock();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js
@@ -250,8 +250,6 @@
 						return false;
 					}
 
-					this.elementOffset = this.element.offset();
-
 					var position = this._getPosition(event);
 
 					index = event.target.index;
@@ -620,12 +618,13 @@
 				},
 				
 				_getPixelMouse : function(position, offsetHandle) {
+					var offset = this.element.offset;
 					var p = (this.orientation === "horizontal" ?
 							position.x
-								- this.elementOffset.left
+								- offset.left
 								- (this._clickOffset ? this._clickOffset.left : 0)
 						 : position.y
-								- this.elementOffset.top
+								- offset.top
 								- (this._clickOffset ? this._clickOffset.top : 0));
 					return p - this.handleSize / 2;
 				},
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollBarUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSScrollBarUI.java
@@ -24,6 +24,8 @@ public class JSScrollBarUI extends JSSliderUI {
 	
 	private boolean isInvisible;
 
+	private boolean isAdjusting;
+
 	public JSScrollBarUI() {
 		super();
 		isScrollBar = true;
@@ -38,10 +40,14 @@ public void propertyChange(PropertyChangeEvent e) {
 
 	@Override
 	public void stateChanged(ChangeEvent e) {
-		super.stateChanged(e);
-		setScrollBarExtentAndCSS();
-		if (debugging) 
-					System.out.println(id + " stateChange " + dumpEvent(e));
+		if (!isAdjusting) {
+			isAdjusting = true;
+			super.stateChanged(e);
+			setScrollBarExtentAndCSS();
+			isAdjusting = false;
+			if (debugging) 
+				System.out.println(id + " stateChange " + dumpEvent(e));
+		}		
 	}
 
 
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
@@ -1161,6 +1161,8 @@ class Handler implements ChangeListener, PropertyChangeListener {// ,
 	// }
 	// }
 
+		private boolean isAdjusting;
+
 		//
 		// ChangeListener: This is added to the vieport, and hsb/vsb models.
 		//
@@ -1189,8 +1191,12 @@ private void vsbStateChanged(JViewport viewport, ChangeEvent e) {
 			BoundedRangeModel model = (BoundedRangeModel) (e.getSource());
 			Point p = viewport.getViewPosition();
 			p.y = model.getValue();
-			viewport.setViewPosition(p);
-			scrollpane.getVerticalScrollBar().setVisibleAmount(viewport.getHeight());
+			if (!isAdjusting) {
+				isAdjusting = true;
+				viewport.setViewPosition(p);
+				scrollpane.getVerticalScrollBar().setVisibleAmount(viewport.getHeight());
+				isAdjusting = false;
+			}
 		}
 
 		private void hsbStateChanged(JViewport viewport, ChangeEvent e) {
@@ -1225,8 +1231,12 @@ private void hsbStateChanged(JViewport viewport, ChangeEvent e) {
 					}
 				}
 			}
-			scrollpane.getHorizontalScrollBar().setVisibleAmount(viewport.getWidth());
-			viewport.setViewPosition(p);
+			if (!isAdjusting) {
+				isAdjusting = true;
+				viewport.setViewPosition(p);
+				scrollpane.getHorizontalScrollBar().setVisibleAmount(viewport.getWidth());
+				isAdjusting = false;
+			}
 		}
 
 		private void viewportStateChanged(ChangeEvent e) {
