From 1e3de699b037989e8deded5c7830139f97c64136 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 09:25:50 -0400
Subject: [PATCH] No use of META ("Windows") modifier.
---
CameraPane.java | 8 ++++----
Object3D.java | 2 +-
Spline.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 83bde94..66e076a 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -12758,7 +12758,7 @@
"MUL final.y, fragment.texcoord[0].x, c256;" +
"FLR final.x, final.y;" +
"SUB final.y, final.y, final.x;" +
- //"MUL final.x, final.x, c256i;" +
+ "MUL final.x, final.x, c256i;" +
"MOV final.z, zero.x;" +
"MOV final.a, one.w;":""
) +
@@ -12766,7 +12766,7 @@
"MUL final.y, fragment.texcoord[0].y, c256;" +
"FLR final.x, final.y;" +
"SUB final.y, final.y, final.x;" +
- //"MUL final.x, final.x, c256i;" +
+ "MUL final.x, final.x, c256i;" +
"MOV final.z, zero.x;" +
"MOV final.a, one.w;":""
) +
@@ -14489,7 +14489,7 @@
}
boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
- if (capsLocked || (modifiers & META) == META)
+ if (capsLocked) // || (modifiers & META) == META)
{
mouseMode |= VR; // BACKFORTH;
}
@@ -15126,7 +15126,7 @@
{
//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
{
mouseMoved(e);
} else
diff --git a/Object3D.java b/Object3D.java
index 2b543d0..6536ddc 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -6984,7 +6984,7 @@
}
//System.out.println("info.modifiers = " + info.modifiers);
- modified = (info.modifiers & CameraPane.META) != 0;
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
//System.out.println("modified = " + modified);
//new Exception().printStackTrace();
//viewCode = info.pane.renderCamera.viewCode;
diff --git a/Spline.java b/Spline.java
index 892e70d..45c5a1d 100644
--- a/Spline.java
+++ b/Spline.java
@@ -189,7 +189,7 @@
boolean doEditClick(ClickInfo info, int level)
{
- boolean modified = (info.modifiers & CameraPane.META) != 0;
+ boolean modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
startX = info.x;
startY = info.y;
int nPoints = ctrlPnts.size();
--
Gitblit v1.6.2