scrollabar/slider work

hansonr · hansonr · commit 70c04cd703b1 · 2019-02-25T06:02:46.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Scrollbar.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Scrollbar.java
@@ -20,6 +20,7 @@ public Scrollbar(int direction) {
 	public Scrollbar(int orientation, int value, int extent, int min, int max) {
 		super(orientation, Math.max(Math.min(value,  max), min), extent, min, max);
 		setOpaque(true);
+		setBlockIncrement(10);
 //		A2SEvent.addListener(this);
 	}
 
@@ -48,7 +49,7 @@ protected void fireAdjustmentValueChanged(int id, int type, int value, boolean a
 		A2SEvent.addListener(this);
 		if (!fromUI)
 			return;
-		System.out.println("a2sscrollbar adjusting " + adjusting);
+		//System.out.println("a2sscrollbar adjusting " + adjusting);
 		super.fireAdjustmentValueChanged(id, type, value, adjusting);
 	}
 
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
@@ -45,15 +45,17 @@ public JSScrollBarUI() {
 	@Override
 	public DOMNode updateDOMNode() {
 		super.updateDOMNode();
-		if (isAWT && !jc.isBackgroundSet())
+		if (isAWT && !jc.isBackgroundSet()) {
 			jc.setBackground(Color.LIGHT_GRAY);
+		}
 		return domNode;
 	}
 
 	@Override
-	public void setBackground(Color background) {
-	  if (background != null)
+	public void setBackgroundCUI(Color background) {
+	  if (background != null) {
 		DOMNode.setStyles(sliderTrack, "background-color", JSToolkit.getCSSColor(background));
+	  }
 	}
 
 	@Override
@@ -124,12 +126,12 @@ void setScrollBarExtentAndCSS() {
 		String left, top, thickness;
 		JScrollBar sb = (JScrollBar) jc; 
 		int extent = sb.getVisibleAmount();
-		int max = sb.getMaximum();
-		int min = sb.getMinimum();
-		
-		float f = (extent > 0 && max > min && extent <= max - min 
-				? extent * 1f / (max - min) : 0.1f);
-		setSliderAttr("handleSize", f);
+//		int max = sb.getMaximum();
+//		int min = sb.getMinimum();
+//		
+//		float f = (extent > 0 && min + extent <= max 
+//				? extent * 1f / (max - min) : 0.1f);
+		setSliderAttr("visibleAmount", extent);
 		boolean isVertical = (orientation == "vertical");
 		if (myScrollPaneUI == null) {
 			// in 
@@ -143,10 +145,10 @@ void setScrollBarExtentAndCSS() {
 			thickness = "12px";
 		}
 		if (isVertical) {
-			DOMNode.setStyles(sliderTrack, "left", left, "width", thickness, "background", "lightgrey");
+			DOMNode.setStyles(sliderTrack, "left", left, "width", thickness, "background", toCSSString(getBackground()));
 			DOMNode.setStyles(sliderHandle, "left", "-1px", "margin-bottom", "0px");
 		} else {
-			DOMNode.setStyles(sliderTrack, "top", top, "height", thickness, "background", "lightgrey");
+			DOMNode.setStyles(sliderTrack, "top", top, "height", thickness, "background", toCSSString(getBackground()));
 			DOMNode.setStyles(sliderHandle, "top", "-1px", "margin-left", "0px");
 		}
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java
@@ -117,13 +117,13 @@ public DOMNode updateDOMNode() {
 		}
 		setup(isNew || isChanged);
 		setSlider();
-		setBackground(jc.getBackground());
+		setBackgroundCUI(getBackground());
 		return updateDOMNodeCUI();
 	}
 
-	public void setBackground(Color background) {
+	public void setBackgroundCUI(Color background) {
 		if (jc.isOpaque())
-			super.setBackground(background);
+			super.setBackgroundCUI(background);
 	}
 
 	private void disposeSlider() {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public Scrollbar(int direction) {`
`20`	`20`	`public Scrollbar(int orientation, int value, int extent, int min, int max) {`
`21`	`21`	`super(orientation, Math.max(Math.min(value, max), min), extent, min, max);`
`22`	`22`	`setOpaque(true);`
	`23`	`+ setBlockIncrement(10);`
`23`	`24`	`// A2SEvent.addListener(this);`
`24`	`25`	`}`
`25`	`26`
`@@ -48,7 +49,7 @@ protected void fireAdjustmentValueChanged(int id, int type, int value, boolean a`
`48`	`49`	`A2SEvent.addListener(this);`
`49`	`50`	`if (!fromUI)`
`50`	`51`	`return;`
`51`		`- System.out.println("a2sscrollbar adjusting " + adjusting);`
	`52`	`+ //System.out.println("a2sscrollbar adjusting " + adjusting);`
`52`	`53`	`super.fireAdjustmentValueChanged(id, type, value, adjusting);`
`53`	`54`	`}`
`54`	`55`
Original file line number	Diff line number	Diff line change
`@@ -117,13 +117,13 @@ public DOMNode updateDOMNode() {`
`117`	`117`	`}`
`118`	`118`	`setup(isNew \|\| isChanged);`
`119`	`119`	`setSlider();`
`120`		`- setBackground(jc.getBackground());`
	`120`	`+ setBackgroundCUI(getBackground());`
`121`	`121`	`return updateDOMNodeCUI();`
`122`	`122`	`}`
`123`	`123`
`124`		`- public void setBackground(Color background) {`
	`124`	`+ public void setBackgroundCUI(Color background) {`
`125`	`125`	`if (jc.isOpaque())`
`126`		`- super.setBackground(background);`
	`126`	`+ super.setBackgroundCUI(background);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`private void disposeSlider() {`