From 36b308e61633916e66dd08ad63aee1a2e7b7d27c Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 2 Dec 2024 01:49:56 +0100 Subject: [PATCH] fixed TradeMenu formating --- .../pp/monopoly/client/gui/TradeMenu.java | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java index b731ae3..7efcae4 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java @@ -84,24 +84,6 @@ public class TradeMenu extends Dialog { mainContent.addChild(createMiddleSection()); mainContent.addChild(createTradeColumn("Wähle Zielobjekt:", false)); - Container buttons = mainContent.addChild(new Container(new SpringGridLayout())); - Button cancel = new Button("Abbrechen"); - cancel.addClickCommands(s -> ifTopDialog(() -> { - close(); - app.getGameLogic().playSound(Sound.BUTTON); - })); - - Button trade = new Button("Handeln"); - trade.addClickCommands(s -> ifTopDialog(() -> { - app.getGameLogic().playSound(Sound.BUTTON); - setTrades(); - app.getGameLogic().send(new TradeOffer(tradeHandler)); - close(); - })); - - buttons.addChild(cancel); - buttons.addChild(trade); - return mainContent; } @@ -196,16 +178,30 @@ public class TradeMenu extends Dialog { leftSelectionsField = middleSection.addChild(new TextField("")); leftSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); - Label arrows = middleSection.addChild(new Label("⇅")); - arrows.setFontSize(40); + Container buttons = middleSection.addChild(new Container(new SpringGridLayout())); + Button cancel = new Button("Abbrechen"); + cancel.addClickCommands(s -> ifTopDialog(() -> { + close(); + app.getGameLogic().playSound(Sound.BUTTON); + })); - rightSelectionsField = middleSection.addChild(new TextField("")); - rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); + Button trade = new Button("Handeln"); + trade.addClickCommands(s -> ifTopDialog(() -> { + app.getGameLogic().playSound(Sound.BUTTON); + setTrades(); + app.getGameLogic().send(new TradeOffer(tradeHandler)); + close(); + })); + + buttons.addChild(cancel); + buttons.addChild(trade); Label middleLabelBottom = middleSection.addChild(new Label("Gebäude: Währung: Sonderkarten:")); middleLabelBottom.setFontSize(24); middleLabelBottom.setInsets(new Insets3f(5, 5, 5, 5)); + rightSelectionsField = middleSection.addChild(new TextField("")); + rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); return middleSection; } @@ -217,6 +213,7 @@ public class TradeMenu extends Dialog { private void styleTextField(TextField textField) { textField.setInsets(new Insets3f(5, 10, 5, 10)); textField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black)); + textField.setPreferredSize(new Vector3f(300, 30, 0)); } private void assignSelectors(Selector buildingSelector, Selector specialCardSelector, TextField currencyInput, boolean isLeft) { @@ -281,7 +278,6 @@ public class TradeMenu extends Dialog { } for (String property : leftselBuildings) { buildingText.append(property); - buildingText.append(", "); } } else { if (rightselBuildings.contains(building.getSelectedItem())) { @@ -291,7 +287,6 @@ public class TradeMenu extends Dialog { } for (String property : rightselBuildings) { buildingText.append(property); - buildingText.append(", "); } }