svn commit: r607659 - in /xmlgraphics/batik/trunk: CHANGES build.xml sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java

[ca...@apache.org]

Author: cam
Date: Sun Dec 30 20:02:11 2007
New Revision: 607659

URL: http://svn.apache.org/viewvc?rev=607659&view=rev
Log:
Workaround problem in OS X where mouse drag events aren't dispatched when Ctrl
is held down, resulting in the Ctrl+drag overlay not showing.  Thanks Chris!

Submitted by: Chris Lewis <ctl271 (at) mail.usask.ca>

Modified:
    xmlgraphics/batik/trunk/CHANGES
    xmlgraphics/batik/trunk/build.xml
    xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java

Modified: xmlgraphics/batik/trunk/CHANGES
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/CHANGES?rev=607659&r1=607658&r2=607659&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/CHANGES (original)
+++ xmlgraphics/batik/trunk/CHANGES Sun Dec 30 20:02:11 2007
@@ -16,7 +16,7 @@
     42543, 42645, 42651, 42697, 42698, 42807, 42961, 42963, 42968,
     43022, 43043, 43045, 43165, 43194, 43195, 43370, 43418, 43446,
     43638, 43657, 43744, 43760, 43764, 43787, 43854, 43871, 43904,
-    43953, 44029, 44054, 44092
+    43953, 44029, 44054, 44092, 44146
 
 2. New features
 
@@ -105,6 +105,7 @@
   * Fixed bug in CSS class name matching, which occured only when an
     element was declared to be a member of multiple classes, where one
     is a prefix of another.
+  * Fixed bug on OS X where the zoom interactor overlay was not shown.
 
 5. Misc
 

Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?rev=607659&r1=607658&r2=607659&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Sun Dec 30 20:02:11 2007
@@ -84,7 +84,7 @@
     <property name="project"            value="batik"/>
     <property name="year"               value="2007"/>
     <property name="version"            value="1.7"/>
-    <property name="revisionType"       value=""/>
+    <property name="revisionType"       value="pre"/>
     <property name="revisionNumber"     value=""/>
     <property name="completeVersion"    value="${version}${revisionType}${revisionNumber}"/>
   

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java?rev=607659&r1=607658&r2=607659&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java Sun Dec 30 20:02:11 2007
@@ -59,6 +59,7 @@
 import org.apache.batik.gvt.renderer.ImageRendererFactory;
 import org.apache.batik.gvt.text.Mark;
 import org.apache.batik.util.HaltingThread;
+import org.apache.batik.util.Platform;
 
 /**
  * This class represents a component which can display a GVT tree.
@@ -1183,7 +1184,12 @@
         public void mouseMoved(MouseEvent e) {
             selectInteractor(e);
             if (interactor != null) {
-                interactor.mouseMoved(e);
+            	// because the mouseDragged event doesn't seem to be generated on OSX when ctrl is held down
+            	if (Platform.isOSX &&
+            		interactor instanceof AbstractZoomInteractor)
+            		mouseDragged(e);
+            	else
+            		interactor.mouseMoved(e);
                 deselectInteractor();
             } else if (eventDispatcher != null) {
                 dispatchMouseMoved(e);