fix guiList

Author: MightyCode

src/MightyLibrary/mightylib/graphics/GUI/GUIList.java

@@ -23,6 +23,8 @@ public class GUIList {
 
     public boolean ShouldLoop = true;
 
+    private boolean mouseMoved;
+
     public GUIList(InputManager inputManager, MouseManager mouseManager) {
         this.mouseManager = mouseManager;
         this.inputManager = inputManager;
@@ -31,6 +33,8 @@ public GUIList(InputManager inputManager, MouseManager mouseManager) {
         selected = null;
         id = null;
         mouseId = null;
+
+        mouseMoved = false;
     }
 
     public Integer getSelected(){
@@ -52,6 +56,8 @@ public void update(){
             }
 
             shouldUpdateSelected();
+
+            mouseMoved = true;
         }
 
         Integer id = null;
@@ -62,11 +68,16 @@ public void update(){
             id = selectDown();
         }
 
-        if (id != null && (!id.equals(this.mouseId)) && !id.equals(this.id)) {
-            unselectAll();
-            GUIs.get(id).forceSelect(true);
-            shouldUpdateSelected();
-        }
+        if (id == null)
+            return;
+
+        if (id.equals(this.id) && !mouseMoved)
+            return;
+
+        unselectAll();
+        GUIs.get(id).forceSelect(true);
+        shouldUpdateSelected();
+        mouseMoved = false;
     }
 
     private void unselectAll(){
@@ -76,10 +87,13 @@ private void unselectAll(){
     }
 
     private Integer selectUp(){
-        if (id == null) {
-            selectMinimum();
-            return null;
-        }
+        if (this.id == null)
+            return selectMinimum();
+
+
+        if (mouseMoved)
+            return this.id;
+
 
         Integer maxId = null, minId = null;
 
@@ -98,19 +112,19 @@ private Integer selectUp(){
             if (minId != null && ShouldLoop) {
                return minId;
             }
-        } else {
-            return maxId;
         }
 
-        return null;
+        return maxId;
     }
 
 
     private Integer selectDown(){
-        if (id == null) {
-            selectMinimum();
-            return null;
-        }
+        if (this.id == null)
+            return selectMinimum();
+
+        if (mouseMoved)
+            return this.id;
+
 
         Integer maxId = null, minId = null;
 
@@ -129,14 +143,12 @@ private Integer selectDown(){
             if (maxId != null && ShouldLoop) {
                 return maxId;
             }
-        } else {
-            return minId;
         }
 
-        return null;
+        return minId;
     }
 
-    private void selectMinimum(){
+    private Integer selectMinimum(){
         Integer min = null;
         for (Map.Entry<Integer, GUI> pair : GUIs.entrySet()) {
             if (min == null)
@@ -145,8 +157,7 @@ else if (min > pair.getKey())
                 min = pair.getKey();
         }
 
-        if (min != null)
-            GUIs.get(min).forceSelect(true);
+        return min;
     }
 
     private void shouldUpdateSelected(){

src/MightyLibrary/project/scenes/MenuScene.java

@@ -31,39 +31,43 @@ public void init(String[] args) {
                 .setReference(EDirection.None)
                 .setPosition(new Vector2f(windowSize.x * 0.5f, windowSize.y * 0.5f))
                 .setFontSize(40)
-                .setText("->Test2DScene<-");
+                .setText("Test2DScene");
 
         button2DScene.Text.copyTo(button2DScene.OverlapsText);
-        button2DScene.OverlapsText.setColor(new Color4f(0.3f));
+        button2DScene.OverlapsText.setColor(new Color4f(0.3f))
+                .setText("->Test2DScene<-");
 
         BackgroundlessButton button3DScene = button2DScene.copy();
         button3DScene.Text.setPosition(new Vector2f(windowSize.x * 0.5f, windowSize.y * 0.6f))
-                        .setText("->Test3DScene<-");
+                        .setText("Test3DScene");
 
         button3DScene.Text.copyTo(button3DScene.OverlapsText);
-        button3DScene.OverlapsText.setColor(new Color4f(0.3f));
+        button3DScene.OverlapsText.setColor(new Color4f(0.3f))
+                .setText("->Test3DScene<-");
 
         BackgroundlessButton buttonCollisionTest = button2DScene.copy();
         buttonCollisionTest.Text.setPosition(new Vector2f(windowSize.x * 0.5f, windowSize.y * 0.7f))
-                .setText("->TestCollisionScene<-");
+                .setText("TestCollisionScene");
 
         buttonCollisionTest.Text.copyTo(buttonCollisionTest.OverlapsText);
-        buttonCollisionTest.OverlapsText.setColor(new Color4f(0.3f));
+        buttonCollisionTest.OverlapsText.setColor(new Color4f(0.3f))
+                .setText("->TestCollisionScene<-");
 
         BackgroundlessButton buttonQuit = button2DScene.copy();
         buttonQuit.Text.setPosition(new Vector2f(windowSize.x * 0.5f, windowSize.y * 0.9f))
-                .setText("->Quit<-");
+                .setText("Quit");
 
         buttonQuit.Text.copyTo(buttonQuit.OverlapsText);
-        buttonQuit.OverlapsText.setColor(new Color4f(0.3f));
+        buttonQuit.OverlapsText.setColor(new Color4f(0.3f))
+                .setText("->Quit<-");
 
         guiList = new GUIList(mainContext.getInputManager(), mainContext.getMouseManager());
         guiList.setupActionInputValues(ActionId.SELECT_UP, ActionId.SELECT_DOWN);
         guiList.GUIs.put(0, button2DScene);
         guiList.GUIs.put(1, button3DScene);
         guiList.GUIs.put(2, buttonCollisionTest);
         guiList.GUIs.put(3, buttonQuit);
-        guiList.ShouldLoop = true;
+        guiList.ShouldLoop = false;
     }