additional cleanups and bug fixes

benfry · benfry · commit 19d436b1cc21 · 2015-05-11T16:39:42.000-04:00
diff --git a/java/src/processing/mode/java/tweak/ColorSelector.java b/java/src/processing/mode/java/tweak/ColorSelector.java
@@ -26,6 +26,7 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.geom.AffineTransform;
@@ -144,7 +145,8 @@ class ColorSelectorBox extends JComponent {
 			  public void mousePressed(MouseEvent e) {
 			    updateMouse(e);
 			  }
-
+			});
+			addMouseMotionListener(new MouseAdapter() {
 			  public void mouseDragged(MouseEvent e) {
 			    updateMouse(e);
         }
@@ -156,10 +158,16 @@ public void paintComponent(Graphics g) {
 		  g.drawImage(backImg, 0, 0, this);
 
 		  Graphics2D g2 = (Graphics2D) g;
+		  // otherwise the oval is hideous
+		  // TODO make a proper hidpi version of all this
+		  g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+		                      RenderingHints.VALUE_ANTIALIAS_ON);
+
 		  g.setColor(lastY < 128 ? Color.BLACK : Color.WHITE);
 			AffineTransform tx = g2.getTransform();
 			g2.translate(lastX, lastY);
-			g2.drawOval(0, 0, 5, 5);
+			//g2.drawOval(0, 0, 5, 5);
+			g2.drawOval(-3, -3, 6, 6);
 			g2.drawLine(-8, 0, -6, 0);
 			g2.drawLine(6, 0, 8, 0);
 			g2.drawLine(0, -8, 0, -6);
@@ -174,7 +182,7 @@ public void renderBack() {
 			for (int j = 0; j < 256; j++) {
 			  for (int i = 0; i < 256; i++) {
 			    pixels[index++] =  // color(hue, i, 255-j);
-			      Color.HSBtoRGB(hue / 255f, (i / 255f), (255-j));
+			      Color.HSBtoRGB(hue / 255f, (i / 255f), (255-j)/255f);
 				}
 			}
 			backImg = new BufferedImage(256, 256, BufferedImage.TYPE_INT_RGB);
@@ -256,7 +264,8 @@ class ColorSelectorSlider extends JComponent {
         public void mousePressed(MouseEvent e) {
           updateMouse(e);
         }
-
+      });
+      addMouseMotionListener(new MouseAdapter() {
         public void mouseDragged(MouseEvent e) {
           updateMouse(e);
         }
@@ -304,6 +313,7 @@ public void paintComponent(Graphics g) {
 			g.drawRect(24, -2, 4, 4);
 			g2.setTransform(tx);
 
+			/*
 			if (colorBox.isBW) {
 //				stroke(255);
 //				rect(0, 0, 29, 254);
@@ -317,6 +327,7 @@ public void paintComponent(Graphics g) {
         g.drawLine(0, 0, 0, 255);
         g.drawLine(29, 0, 29, 255);
 			}
+			*/
 		}
 
 
