From a9e12f6c508810604c8c91ee15451776b08ce1a1 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Mon, 22 Apr 2019 07:41:56 -0400 Subject: [PATCH] Camera capslock fix --- CameraPane.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CameraPane.java b/CameraPane.java index b5fba83..c50eebc 100644 --- a/CameraPane.java +++ b/CameraPane.java @@ -11936,9 +11936,10 @@ return; } + boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); // TIMER - if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR + if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR { keepboxmode = BOXMODE; keepsupport = SUPPORT; @@ -12639,6 +12640,7 @@ { manipCamera.Translate(dx, dy, getWidth()); } + else if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0) { manipCamera.RotateInterest(dx, dy); @@ -12872,7 +12874,7 @@ } if ((modifiers & CTRLCLICK) == CTRLCLICK) { - mouseMode |= SELECT; // BACKFORTH; + mouseMode |= SELECT; } if ((modifiers & COMMAND) == COMMAND) { @@ -13240,8 +13242,8 @@ repaint(); break; case 'Z': - RESIZETEXTURE ^= true; - break; + //RESIZETEXTURE ^= true; + //break; case 'z': RENDERSHADOW ^= true; lighttouched = true; -- Gitblit v1.6.2