From 7cbf000c445b5545b7dd3a28af34040004bd9015 Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 9 Dec 2024 17:57:00 +0100 Subject: [PATCH] readjusted popup layering --- .../pp/monopoly/client/gui/popups/BuildingPropertyCard.java | 4 ++-- .../java/pp/monopoly/client/gui/popups/EventCardPopup.java | 4 ++-- .../src/main/java/pp/monopoly/client/gui/popups/Gulag.java | 4 ++-- .../main/java/pp/monopoly/client/gui/popups/GulagInfo.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java index fd17bc1..b16430d 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java @@ -94,14 +94,14 @@ public class BuildingPropertyCard extends Dialog { buildingPropertyContainer.setLocalTranslation( (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2, (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2, - 10 + 16 ); // Zentriere das Popup backgroundContainer.setLocalTranslation( (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x - padding) / 2, (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y+ padding) / 2, - 9 + 15 ); app.getGuiNode().attachChild(buildingPropertyContainer); diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java index 21eaabb..7db7f63 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java @@ -83,14 +83,14 @@ public class EventCardPopup extends Dialog { eventCardContainer.setLocalTranslation( (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2, (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2, - 8 + 10 ); // Zentriere das Popup backgroundContainer.setLocalTranslation( (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2, (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2, - 7 + 9 ); app.getGuiNode().attachChild(eventCardContainer); diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java index 4d41045..554f994 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java @@ -81,14 +81,14 @@ public class Gulag extends Dialog { gulagContainer.setLocalTranslation( (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x) / 2, (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y) / 2, - 8 + 12 ); // Zentriere das Popup backgroundContainer.setLocalTranslation( (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x - padding) / 2, (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y+ padding) / 2, - 7 + 11 ); app.getGuiNode().attachChild(gulagContainer); diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GulagInfo.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GulagInfo.java index 83396fd..c1314e7 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GulagInfo.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GulagInfo.java @@ -95,14 +95,14 @@ public class GulagInfo extends Dialog { gulagInfoContainer.setLocalTranslation( (app.getCamera().getWidth() - gulagInfoContainer.getPreferredSize().x) / 2, (app.getCamera().getHeight() + gulagInfoContainer.getPreferredSize().y) / 2, - 8 + 14 ); // Zentriere das MenĂ¼ backgroundContainer.setLocalTranslation( (app.getCamera().getWidth() - gulagInfoContainer.getPreferredSize().x - padding) / 2, (app.getCamera().getHeight() + gulagInfoContainer.getPreferredSize().y+ padding) / 2, - 7 + 13 ); if(app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getNumJailCard() == 0) {