mirror of
https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git
synced 2025-01-18 19:33:40 +01:00
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
This commit is contained in:
commit
f396ef52f2
@ -77,7 +77,7 @@ public class BuyHouse extends Dialog {
|
||||
backgroundContainer.setPreferredSize(buyHouseContainer.getPreferredSize().addLocal(padding, padding, 0));
|
||||
|
||||
// Title
|
||||
Label title = buyHouseContainer.addChild(new Label("Gebäude Kaufen", new ElementId("warning-Bold")));
|
||||
Label title = buyHouseContainer.addChild(new Label("Gebäude Kaufen", new ElementId("label-Bold")));
|
||||
title.setFontSize(48);
|
||||
title.setColor(ColorRGBA.Black);
|
||||
|
||||
@ -145,7 +145,7 @@ public class BuyHouse extends Dialog {
|
||||
private Container createPropertyDropdown() {
|
||||
Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
|
||||
dropdownContainer.setPreferredSize(new Vector3f(300, 200, 0));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
|
||||
|
||||
VersionedList<String> propertyOptions = new VersionedList<>();
|
||||
List<BuildingProperty> playerProperties = getPlayerProperties();
|
||||
@ -164,6 +164,7 @@ public class BuyHouse extends Dialog {
|
||||
// Initialize the selection display here
|
||||
selectionDisplay = new Label("");
|
||||
selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
|
||||
selectionDisplay.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
|
||||
dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
|
||||
|
||||
// Set initial selection
|
||||
|
@ -82,7 +82,7 @@ public class RepayMortage extends Dialog {
|
||||
backgroundContainer.setPreferredSize(repayMortageContainer.getPreferredSize().addLocal(padding, padding, 0));
|
||||
|
||||
// Titel
|
||||
Label title = repayMortageContainer.addChild(new Label( "Hypothek Abbezahlen", new ElementId("warining-Bold")));
|
||||
Label title = repayMortageContainer.addChild(new Label( "Hypothek Abbezahlen", new ElementId("label-Bold")));
|
||||
title.setFontSize(48);
|
||||
title.setColor(ColorRGBA.Black);
|
||||
|
||||
@ -97,7 +97,7 @@ public class RepayMortage extends Dialog {
|
||||
upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
|
||||
|
||||
middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
|
||||
middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
|
||||
middleContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
|
||||
|
||||
middleContainer.addChild(createPropertyDropdown());
|
||||
|
||||
@ -149,7 +149,7 @@ public class RepayMortage extends Dialog {
|
||||
private Container createPropertyDropdown() {
|
||||
Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
|
||||
dropdownContainer.setPreferredSize(new Vector3f(300, 200, 0));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
|
||||
|
||||
VersionedList<String> propertyOptions = new VersionedList<>();
|
||||
List<PropertyField> playerProperties = getPlayerProperties();
|
||||
@ -168,6 +168,7 @@ public class RepayMortage extends Dialog {
|
||||
// Initialize the selection display here
|
||||
selectionDisplay = new Label(""); // Create TextField for displaying selections
|
||||
selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
|
||||
selectionDisplay.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
|
||||
dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
|
||||
|
||||
// Set initial selection
|
||||
|
@ -82,7 +82,7 @@ public class SellHouse extends Dialog {
|
||||
backgroundContainer.setPreferredSize(sellhouseContainer.getPreferredSize().addLocal(padding, padding, 0));
|
||||
|
||||
// Titel
|
||||
Label title = sellhouseContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("warining-Bold")));
|
||||
Label title = sellhouseContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("label-Bold")));
|
||||
title.setFontSize(48);
|
||||
title.setColor(ColorRGBA.Black);
|
||||
|
||||
@ -155,7 +155,7 @@ public class SellHouse extends Dialog {
|
||||
private Container createPropertyDropdown() {
|
||||
Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
|
||||
dropdownContainer.setPreferredSize(new Vector3f(300, 200, 0));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
|
||||
|
||||
VersionedList<String> propertyOptions = new VersionedList<>();
|
||||
List<BuildingProperty> playerProperties = getPlayerProperties();
|
||||
@ -174,6 +174,7 @@ public class SellHouse extends Dialog {
|
||||
// Initialize the selection display here
|
||||
selectionDisplay = new Label("");
|
||||
selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
|
||||
selectionDisplay.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
|
||||
dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
|
||||
|
||||
// Set initial selection
|
||||
|
@ -83,7 +83,7 @@ public class TakeMortage extends Dialog {
|
||||
backgroundContainer.setPreferredSize(takeMortageContainer.getPreferredSize().addLocal(padding, padding, 0));
|
||||
|
||||
// Titel
|
||||
Label title = takeMortageContainer.addChild(new Label( "Hypothek aufnehmen", new ElementId("warining-Bold")));
|
||||
Label title = takeMortageContainer.addChild(new Label( "Hypothek aufnehmen", new ElementId("label-Bold")));
|
||||
title.setFontSize(48);
|
||||
title.setColor(ColorRGBA.Black);
|
||||
|
||||
@ -150,7 +150,7 @@ public class TakeMortage extends Dialog {
|
||||
private Container createPropertyDropdown() {
|
||||
Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
|
||||
dropdownContainer.setPreferredSize(new Vector3f(300, 200, 0));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
|
||||
dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
|
||||
|
||||
VersionedList<String> propertyOptions = new VersionedList<>();
|
||||
List<PropertyField> playerProperties = getPlayerProperties();
|
||||
@ -174,6 +174,7 @@ public class TakeMortage extends Dialog {
|
||||
// Initialize the selection display here
|
||||
selectionDisplay = new Label(""); // Create TextField for displaying selections
|
||||
selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
|
||||
selectionDisplay.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
|
||||
dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
|
||||
|
||||
// Set initial selection
|
||||
|
Loading…
Reference in New Issue
Block a user