only close panel after click is fully processed

Author: brachy84

src/main/java/com/cleanroommc/modularui/screen/ModularPanel.java

@@ -72,8 +72,8 @@ public static ModularPanel defaultPanel(@NotNull String name, int width, int hei
     private final String name;
     private ModularScreen screen;
     private IPanelHandler panelHandler;
-    private State state = State.IDLE;
-    private boolean cantDisposeNow = false;
+    private State state = State.CLOSED;
+    private boolean cantCloseNow = false;
     private final ObjectList<LocatedWidget> hovering = ObjectList.create();
     private final Input keyboard = new Input();
     private final Input mouse = new Input();
@@ -135,7 +135,7 @@ public void setPanelSyncHandler(PanelSyncHandler syncHandler) {
      * @return true if this panel is currently open on a screen
      */
     public boolean isOpen() {
-        return this.state == State.OPEN;
+        return this.state.open;
     }
 
     /**
@@ -144,6 +144,14 @@ public boolean isOpen() {
      */
     public void closeIfOpen() {
         if (!isOpen()) return;
+        if (this.cantCloseNow) {
+            if (!this.state.disposing) {
+                this.state = State.WAIT_CLOSING;
+            } else {
+                this.state = State.WAIT_CLOSING_AND_DISPOSING;
+            }
+            return;
+        }
         closeSubPanels();
         if (isMainPanel()) {
             // close screen and let NEA handle animation
@@ -267,12 +275,16 @@ public void onClose() {
     @MustBeInvokedByOverriders
     @Override
     public void dispose() {
-        if (this.state == State.DISPOSED) return;
-        if (this.state != State.CLOSED && this.state != State.WAIT_DISPOSING) {
+        if (this.state.disposing) return;
+        if (this.state.open && !this.state.closing) {
             throw new IllegalStateException("Panel must be closed before disposing!");
         }
-        if (this.cantDisposeNow) {
-            this.state = State.WAIT_DISPOSING;
+        if (this.cantCloseNow) {
+            if (this.state.closing) {
+                this.state = State.WAIT_CLOSING_AND_DISPOSING;
+            } else {
+                this.state = State.WAIT_DISPOSING;
+            }
             return;
         }
         super.dispose();
@@ -293,12 +305,18 @@ public final <T> T doSafe(Supplier<T> runnable) {
         if (this.state == State.DISPOSED) return null;
         // make sure the screen is also not disposed
         return getScreen().getPanelManager().doSafe(() -> {
-            this.cantDisposeNow = true;
+            this.cantCloseNow = true;
             T t = runnable.get();
-            this.cantDisposeNow = false;
-            if (this.state == State.WAIT_DISPOSING) {
-                this.state = State.CLOSED;
-                dispose();
+            this.cantCloseNow = false;
+            if (this.state.open) {
+                if (this.state.closing) {
+                    this.state = State.OPEN;
+                    closeIfOpen();
+                }
+                if (this.state.disposing) {
+                    this.state = State.CLOSED;
+                    dispose();
+                }
             }
             return t;
         });
@@ -846,26 +864,39 @@ public State getState() {
     }
 
     public enum State {
-        /**
-         * Initial state of any panel.
-         */
-        IDLE,
+
         /**
          * State after the panel opened.
          */
-        OPEN,
+        OPEN(true, false, false),
         /**
          * State after panel closed. Panel can still be reopened in this state.
          */
-        CLOSED,
+        CLOSED(false, true, false),
         /**
          * State after panel disposed. The panel is now lost and has to be rebuilt, when reopening it.
          */
-        DISPOSED,
+        DISPOSED(false, true, true),
+        /**
+         * Panel is open and is waiting to be closed.
+         */
+        WAIT_CLOSING(true, true, false),
         /**
          * Panel is closed and is waiting to be disposed.
          */
-        WAIT_DISPOSING
+        WAIT_DISPOSING(true, false, true),
+        /**
+         * Panel is open abd is waiting to close and then to be disposed.
+         */
+        WAIT_CLOSING_AND_DISPOSING(true, true, true);
+
+        public final boolean open, closing, disposing;
+
+        State(boolean open, boolean closing, boolean disposing) {
+            this.open = open;
+            this.closing = closing;
+            this.disposing = disposing;
+        }
     }
 
     /**

src/main/java/com/cleanroommc/modularui/screen/PanelManager.java

@@ -196,7 +196,7 @@ public void openPanel(@NotNull ModularPanel panel, @NotNull IPanelHandler panelH
         openPanel(panel, true);
     }
 
-    public void closePanel(@NotNull ModularPanel panel) {
+    void closePanel(@NotNull ModularPanel panel) {
         if (!hasOpenPanel(panel)) {
             throw new IllegalArgumentException("Panel '" + panel.getName() + "' is open in this screen!");
         }

src/main/java/com/cleanroommc/modularui/test/TestTile.java

@@ -24,6 +24,7 @@
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
 import com.cleanroommc.modularui.value.sync.ItemSlotSH;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.value.sync.StringSyncValue;
 import com.cleanroommc.modularui.widget.EmptyWidget;
 import com.cleanroommc.modularui.widget.ParentWidget;
 import com.cleanroommc.modularui.widgets.ButtonWidget;
@@ -44,6 +45,7 @@
 import com.cleanroommc.modularui.widgets.slot.ModularSlot;
 import com.cleanroommc.modularui.widgets.slot.PhantomItemSlot;
 import com.cleanroommc.modularui.widgets.slot.SlotGroup;
+import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -85,6 +87,7 @@ public class TestTile extends TileEntity implements IGuiHolder<PosGuiData>, ITic
     private final int duration = 80;
     private int progress = 0;
     private int cycleState = 0;
+    private String s = "";
     private List<Integer> serverInts = new ArrayList<>();
     private ItemStack displayItem = new ItemStack(Items.DIAMOND);
     private final ItemStackHandler storage = new ItemStackHandler(9);
@@ -341,6 +344,9 @@ public ModularPanel openSecondWindow(PanelSyncManager syncManager, IPanelHandler
         IPanelHandler panelSyncHandler = syncManager.syncedPanel("other_panel_2", true, (syncManager1, syncHandler1) ->
                 openThirdWindow(syncManager1, syncHandler1, number));
         IntSyncValue num = syncManager.getHyperVisor().findSyncHandler("cycle_state", IntSyncValue.class);
+        panel.child(new TextFieldWidget()
+                .size(60, 14).pos(10, 80)
+                .value(new StringSyncValue(() -> s, v -> s = v)));
         panel.child(ButtonWidget.panelCloseButton())
                 .child(new ButtonWidget<>()
                         .size(10).top(14).right(4)