Revision: 20872
http://sourceforge.net/p/jmol/code/20872
Author: hansonr
Date: 2015-11-30 17:23:55 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/nbo/Jmol/src/org/jmol/awt/Mouse.java
Modified: branches/nbo/Jmol/src/org/jmol/awt/Mouse.java
===================================================================
--- branches/nbo/Jmol/src/org/jmol/awt/Mouse.java 2015-11-30 00:00:28 UTC
(rev 20871)
+++ branches/nbo/Jmol/src/org/jmol/awt/Mouse.java 2015-11-30 17:23:55 UTC
(rev 20872)
@@ -308,11 +308,13 @@
private void mouseEntered(long time, int x, int y) {
wheeling = false;
+ isMouseDown = false;
manager.mouseEnterExit(time, x, y, false);
}
private void mouseExited(long time, int x, int y) {
wheeling = false;
+ isMouseDown = false;
manager.mouseEnterExit(time, x, y, true);
}
@@ -333,11 +335,12 @@
private boolean isMouseDown; // Macintosh may not recognize CTRL-SHIFT-LEFT
as drag, only move
private boolean wheeling;
+ private int modifiersDown;
private void mouseMoved(long time, int x, int y, int modifiers) {
clearKeyBuffer();
if (isMouseDown)
- manager.mouseAction(Event.DRAGGED, time, x, y, 0,
applyLeftMouse(modifiers));
+ manager.mouseAction(Event.DRAGGED, time, x, y, 0, modifiersDown);
else
manager.mouseAction(Event.MOVED, time, x, y, 0, modifiers);
}
@@ -361,12 +364,14 @@
boolean isPopupTrigger) {
clearKeyBuffer();
isMouseDown = true;
+ modifiersDown = modifiers; // Mac does not transmit these during drag
wheeling = false;
manager.mouseAction(Event.PRESSED, time, x, y, 0, modifiers);
}
private void mouseReleased(long time, int x, int y, int modifiers) {
isMouseDown = false;
+ modifiersDown = 0;
wheeling = false;
manager.mouseAction(Event.RELEASED, time, x, y, 0, modifiers);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
