adds MouseEvent.preciseWheelRotation

BobHanson · BobHanson · commit cd8a6c539307 · 2018-06-25T12:43:56.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -4130,7 +4130,8 @@ boolean dispatchMouseWheelToAncestor(MouseWheelEvent e) {
 																		// source
 						newY, // y relative to new source
 						e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getScrollType(),
-						e.getScrollAmount(), e.getWheelRotation());
+						e.getScrollAmount(), e.getWheelRotation(),
+                        e.getPreciseWheelRotation());
 				((AWTEvent) e).copyPrivateDataInto(newMWE);
 				// When dispatching a wheel event to
 				// ancestor, there is no need trying to find descendant
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
@@ -4733,7 +4733,8 @@ void retargetMouseEvent(Component target, int id, MouseEvent e) {
                                        e.isPopupTrigger(),
                                        ((MouseWheelEvent)e).getScrollType(),
                                        ((MouseWheelEvent)e).getScrollAmount(),
-                                       ((MouseWheelEvent)e).getWheelRotation());
+                                       ((MouseWheelEvent)e).getWheelRotation(),
+                                       ((MouseWheelEvent)e).getPreciseWheelRotation());
             }
             else {
                 retargeted = new MouseEvent(target,
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/event/MouseWheelEvent.java b/sources/net.sf.j2s.java.core/src/java/awt/event/MouseWheelEvent.java
@@ -134,6 +134,9 @@ public class MouseWheelEvent extends MouseEvent {
      * @see #getWheelRotation
      */
     int wheelRotation;
+    
+    double preciseWheelRotation;
+    
 
     /*
      * serialVersionUID
@@ -179,7 +182,6 @@ public class MouseWheelEvent extends MouseEvent {
     public MouseWheelEvent (Component source, int id, long when, int modifiers,
                       int x, int y, int clickCount, boolean popupTrigger,
                       int scrollType, int scrollAmount, int wheelRotation) {
-
         this(source, id, when, modifiers, x, y, 0, 0, clickCount,
              popupTrigger, scrollType, scrollAmount, wheelRotation);
     }
@@ -226,15 +228,24 @@ public MouseWheelEvent (Component source, int id, long when, int modifiers,
     public MouseWheelEvent (Component source, int id, long when, int modifiers,
                             int x, int y, int xAbs, int yAbs, int clickCount, boolean popupTrigger,
                             int scrollType, int scrollAmount, int wheelRotation) {
-
+    	this(source, id, when, modifiers, x, y, xAbs, yAbs, clickCount, popupTrigger, 
+    				scrollType, scrollAmount, wheelRotation, wheelRotation);
+    }
+    
+    public MouseWheelEvent (Component source, int id, long when, int modifiers,
+            int x, int y, int xAbs, int yAbs, int clickCount, boolean popupTrigger,
+            int scrollType, int scrollAmount, int wheelRotation, double preciseWheelRotation) {
+    	// ala Java 7    	
         super(source, id, when, modifiers, x, y, xAbs, yAbs, clickCount,
               popupTrigger, MouseEvent.NOBUTTON);
 
         this.scrollType = scrollType;
         this.scrollAmount = scrollAmount;
         this.wheelRotation = wheelRotation;
+        this.preciseWheelRotation = preciseWheelRotation;
     }
 
+
     /**
      * Returns the type of scrolling that should take place in response to this
      * event.  This is determined by the native platform.  Legal values are:
@@ -281,6 +292,11 @@ public int getWheelRotation() {
         return wheelRotation;
     }
 
+    public double getPreciseWheelRotation() {
+    	// SwingJS no different here
+        return preciseWheelRotation; 
+    }
+
     /**
      * This is a convenience method to aid in the implementation of
      * the common-case MouseWheelListener - to scroll a ScrollPane or
