From ff5bb33059196214136d2ec929a8933868101ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Thu, 11 Mar 2021 23:40:16 +0100 Subject: [PATCH] Create scaffolding for Window API | fix some positioning issues in BaseComponent --- .../base/api/game/gui/window/DefaultWindowManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DefaultWindowManager.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DefaultWindowManager.java index 4c1b2278..98397c85 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DefaultWindowManager.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DefaultWindowManager.java @@ -52,14 +52,18 @@ public class DefaultWindowManager extends BaseWidget implements WindowManager { public void open(Window window) { requireNonNull(window, "Window cannot be null"); - windows.push(window); + windows.addLast(window); window.setParent(this); window.onOpen(this); } @Override public void close() { - var window = windows.pop(); + if (windows.isEmpty()) { + return; + } + + var window = windows.removeLast(); window.setParent(null); window.onClose(this); }