Merge pull request #9 from zeroeightysix/master

New changes from 086
kami-blue · Aug 7, 2019 · ee2176d · ee2176d
2 parents 80dd529 + 6631ea8
commit ee2176d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # KAMI
 [![Build Status](https://travis-ci.com/zeroeightysix/KAMI.svg?branch=master)](https://travis-ci.com/zeroeightysix/KAMI)
-[![Maintainability](https://api.codeclimate.com/v1/badges/81228111eb82b7ca391e/maintainability)](https://codeclimate.com/github/zeroeightysix/KAMI/maintainability)
 [![Issues](https://img.shields.io/github/issues/zeroeightysix/kami.svg)](https://github.com/zeroeightysix/kami/issues)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](http://discord.gg/9hvwgeg)
 

diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java
@@ -14,6 +14,7 @@
 import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
 import me.zeroeightsix.kami.gui.rgui.util.ContainerHelper;
 import me.zeroeightsix.kami.gui.rgui.util.Docking;
+import me.zeroeightsix.kami.util.Bind;
 import me.zeroeightsix.kami.util.ColourHolder;
 import me.zeroeightsix.kami.util.Wrapper;
 import org.lwjgl.opengl.GL11;
@@ -253,6 +254,7 @@ public void updateLocation(Component component, int oldX, int oldY) { }
         component.addPoof(new Frame.FrameDragPoof<Frame, Frame.FrameDragPoof.DragInfo>() {
             @Override
             public void execute(Frame component, DragInfo info) {
+                if (Bind.isShiftDown() || Bind.isAltDown() || Bind.isCtrlDown()) return;
                 int x = info.getX();
                 int y = info.getY();
                 yLineComponent = null;

diff --git a/src/main/java/me/zeroeightsix/kami/util/Bind.java b/src/main/java/me/zeroeightsix/kami/util/Bind.java
@@ -65,14 +65,15 @@ public boolean isDown(int eventKey) {
         return !isEmpty() && (!BindCommand.modifiersEnabled.getValue() || (isShift() == isShiftDown()) && (isCtrl() == isCtrlDown()) && (isAlt() == isAltDown())) && eventKey == getKey();
     }
 
-    private boolean isShiftDown() {
+    public static boolean isShiftDown() {
         return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
     }
-    private boolean isCtrlDown() {
+
+    public static boolean isCtrlDown() {
         return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
     }
 
-    private boolean isAltDown() {
+    public static boolean isAltDown() {
         return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
     }