fix(GameMenu): fix the UI cursor not showing in the game menu

Author: BenjaminAmos

engine/src/main/java/org/destinationsol/ui/nui/NUIManager.java

@@ -53,7 +53,6 @@
 import org.terasology.nui.events.NUIMouseButtonEvent;
 import org.terasology.nui.events.NUIMouseWheelEvent;
 import org.terasology.nui.skin.UISkin;
-import org.terasology.nui.util.RectUtility;
 import org.terasology.nui.widgets.UIButton;
 import org.terasology.nui.widgets.UIText;
 
@@ -226,9 +225,13 @@ public void update(SolApplication solApplication) {
         for (MouseAction action : mouse.getInputQueue()) {
             if (action.getInput().getType() == InputType.MOUSE_BUTTON) {
                 if (action.getState().isDown()) {
-                    canvas.processMouseClick((MouseInput) action.getInput(), action.getMousePosition(), action.getPointer());
+                    if (canvas.processMouseClick((MouseInput) action.getInput(), action.getMousePosition(), action.getPointer())) {
+                        continue;
+                    }
                 } else {
-                    canvas.processMouseRelease((MouseInput) action.getInput(), action.getMousePosition(), action.getPointer());
+                    if (canvas.processMouseRelease((MouseInput) action.getInput(), action.getMousePosition(), action.getPointer())) {
+                        continue;
+                    }
                 }
 
                 NUIMouseButtonEvent event = new NUIMouseButtonEvent((MouseInput) action.getInput(), action.getState(), action.getMousePosition());
@@ -433,10 +436,9 @@ public void setContext(Context context) {
      * @return true, if the mouse is currently over an interactive UI element, otherwise false
      */
     public boolean isMouseOnUi() {
-        // TODO: Find better way of doing this.
         Vector2i mousePosition = mouse.getPosition();
         for (Rectanglei interactionRegion : canvas.getInteractionRegions()) {
-            if (!interactionRegion.equals(canvas.getRegion()) && interactionRegion.containsPoint(mousePosition)) {
+            if (interactionRegion.containsPoint(mousePosition)) {
                 return true;
             }
         }

engine/src/main/java/org/destinationsol/ui/nui/screens/InventoryScreen.java

@@ -176,6 +176,14 @@ public void onAdded() {
         updateItemRows();
     }
 
+    /**
+     * Returns the current {@link InventoryOperationsScreen operations screen} being applied to this screen.
+     * @return the current operations screen
+     */
+    public InventoryOperationsScreen getOperations() {
+        return inventoryOperations;
+    }
+
     /**
      * Assigns the specified {@link InventoryOperationsScreen operations screen} to this screen.
      * @param operations the operations that can be performed

engine/src/main/java/org/destinationsol/ui/nui/screens/MainGameScreen.java

@@ -28,20 +28,14 @@
 import org.destinationsol.game.ship.SolShip;
 import org.destinationsol.ui.SolInputManager;
 import org.destinationsol.ui.nui.NUIScreenLayer;
-import org.destinationsol.ui.nui.widgets.KeyActivatedButton;
 import org.destinationsol.ui.nui.widgets.UIWarnButton;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.input.ButtonState;
 import org.terasology.input.Keyboard;
 import org.terasology.nui.AbstractWidget;
-import org.terasology.nui.BaseInteractionListener;
-import org.terasology.nui.Canvas;
-import org.terasology.nui.InteractionListener;
 import org.terasology.nui.UIWidget;
-import org.terasology.nui.asset.UIElement;
 import org.terasology.nui.backends.libgdx.GDXInputUtil;
 import org.terasology.nui.events.NUIKeyEvent;
-import org.terasology.nui.events.NUIMouseClickEvent;
+import org.terasology.nui.events.NUIMouseButtonEvent;
 
 import java.util.List;
 
@@ -62,18 +56,6 @@ public class MainGameScreen extends NUIScreenLayer {
     @In
     private SolApplication solApplication;
 
-    private final InteractionListener interactionListener = new BaseInteractionListener() {
-        @Override
-        public boolean onMouseClick(NUIMouseClickEvent event) {
-            NUIScreenLayer topScreen = nuiManager.getTopScreen();
-            if (topScreen != MainGameScreen.this && !(topScreen instanceof UIShipControlsScreen)) {
-                nuiManager.popScreen();
-                return true;
-            }
-            return false;
-        }
-    };
-
     @Override
     public void initialise() {
         consoleScreen = (ConsoleScreen) nuiManager.createScreen("engine:console");
@@ -174,12 +156,6 @@ public void update(float delta) {
         }
     }
 
-    @Override
-    public void onDraw(Canvas canvas) {
-        canvas.addInteractionRegion(interactionListener);
-        super.onDraw(canvas);
-    }
-
     @Override
     protected boolean escapeCloses() {
         return false;
@@ -210,6 +186,18 @@ public boolean onKeyEvent(NUIKeyEvent event) {
         return super.onKeyEvent(event);
     }
 
+    @Override
+    public void onMouseButtonEvent(NUIMouseButtonEvent event) {
+        if (event.getState() == ButtonState.UP) {
+            NUIScreenLayer topScreen = nuiManager.getTopScreen();
+            if (!solApplication.getInputManager().isMouseOnUi() &&
+                    topScreen != MainGameScreen.this && !(topScreen instanceof UIShipControlsScreen)) {
+                nuiManager.popScreen();
+                event.consume();
+            }
+        }
+    }
+
     @Override
     public void onRemoved() {
         menuButton.unsubscribe(this::onMenuButtonClicked);
@@ -306,6 +294,8 @@ private void onMercsButtonClicked(UIWidget widget) {
             gameScreens.inventoryScreen.setOperations(gameScreens.inventoryScreen.getChooseMercenaryScreen());
             nuiManager.pushScreen(gameScreens.inventoryScreen);
             solApplication.getGame().getHero().getMercs().markAllAsSeen();
+        } else {
+            nuiManager.removeScreen(gameScreens.inventoryScreen);
         }
     }
 }