From 5e0ac0abc750508c2be87d41c11f72b4e862de62 Mon Sep 17 00:00:00 2001
From: Yvonne Schmidt <yvonne.schmidt@unibw.de>
Date: Thu, 28 Nov 2024 03:58:40 +0100
Subject: [PATCH] fixed button disabled behaviour

---
 .../Interface/Lemur/pp-styles.groovy          | 34 +++++++++++++++++++
 .../java/pp/monopoly/client/gui/Toolbar.java  |  8 ++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
index 550ad7c..b9f394e 100644
--- a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
+++ b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
@@ -297,3 +297,37 @@ selector("selector.item.label", "hover") {
     background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
 }
 
+
+def enabledCommandToolbar = new Command<Button>() {
+    void execute(Button source) {
+        if (source.isEnabled())
+            source.setColor(ColorRGBA.White)
+        else
+            source.setColor(ColorRGBA.Gray)
+
+
+    }
+}
+
+def stdButtonCommandsToolbar = [
+        (ButtonAction.Down)    : [pressedCommand],
+        (ButtonAction.Up)      : [pressedCommand],
+        (ButtonAction.Enabled) : [enabledCommandToolbar],
+        (ButtonAction.Disabled): [enabledCommandToolbar]
+]
+
+selector("button-toolbar", "pp") {
+    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Orange border
+    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // Inner button background
+
+    // Apply the outer border as the main background
+    background = outerBackground
+
+    // Use insets to create a margin/padding effect for the inner background
+    insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
+    buttonCommands = stdButtonCommandsToolbar
+}
+
+
diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java
index 10b6369..bdcd65a 100644
--- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java
+++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java
@@ -83,7 +83,7 @@ public class Toolbar extends Dialog implements GameEventListener {
         diceContainer.addChild(horizontalContainer);
 
         // Würfeln-Button
-        Button diceButton = new Button("Würfeln");
+        Button diceButton = new Button("Würfeln", new ElementId("button-toolbar"));
         diceButton.setPreferredSize(new Vector3f(200, 50, 0));
         diceButton.addClickCommands(s -> ifTopDialog(() -> {
             startDiceAnimation();
@@ -103,7 +103,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addTradeMenuButton() {
-        Button tradeButton = new Button("Handeln");
+        Button tradeButton = new Button("Handeln", new ElementId("button-toolbar"));
         tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
         tradeButton.addClickCommands(s -> ifTopDialog(() -> {
             app.getGameLogic().playSound(Sound.BUTTON);
@@ -113,7 +113,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addPropertyMenuButton() {
-        Button propertyMenuButton = new Button("Grundstücke");
+        Button propertyMenuButton = new Button("Grundstücke", new ElementId("button-toolbar"));
         propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
         propertyMenuButton.setFontSize(30);
         propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
@@ -125,7 +125,7 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     private Button addEndTurnButton() {
-        Button endTurnButton = new Button("Zug beenden");
+        Button endTurnButton = new Button("Zug beenden", new ElementId("button-toolbar"));
         endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
         endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
             app.getGameLogic().playSound(Sound.BUTTON);