From 20027dd8aedb6687c410d6a0b38f4e1bc8cdd92e Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Thu, 15 Jun 2017 12:10:05 +0200
Subject: [PATCH] Fix unexpected Stop button behavior

---
 .../io/sarl/demos/fireworks/FireworksFXApplication.fxml     | 6 +++---
 .../io/sarl/demos/fireworks/gui/FXMLViewerController.sarl   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
index c687201..9dd2e34 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
+++ b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
@@ -25,14 +25,14 @@
                <tooltip>
                   <Tooltip text="%GravityTooltip" />
                </tooltip></ScrollBar>
-            <Label fx:id="gravity_display" layoutX="113.0" layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="0,5" />
+            <Label fx:id="gravity_display" layoutX="135.0" layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="0,5" textAlignment="RIGHT" />
             <Label layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="%GravityLabelText" />
          </children>
       </AnchorPane>
       <AnchorPane layoutX="27.0" layoutY="255.0">
          <children>
             <Label layoutX="4.0" layoutY="17.0" text="%FireQuantityLabelText" />
-            <Label fx:id="fire_quantity_display" layoutX="117.0" layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="30" />
+            <Label fx:id="fire_quantity_display" layoutX="135.0" layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="30" textAlignment="RIGHT" />
             <ScrollBar fx:id="fire_quantity_input" layoutX="4.0" max="50.0" min="5.0" onMouseEntered="#actionFireQuantityDisplay" prefHeight="17.0" prefWidth="159.0" value="30.0">
                <tooltip>
                   <Tooltip text="%FireQuantityTooltip" />
@@ -46,7 +46,7 @@
                   <Tooltip text="%RocketQuantityTooltip" />
                </tooltip></ScrollBar>
             <Label layoutY="20.0" text="%RocketQuantityLabelText" />
-            <Label fx:id="rocket_quantity_display" layoutX="113.0" layoutY="20.0" prefHeight="17.0" prefWidth="46.0" text="20" />
+            <Label fx:id="rocket_quantity_display" layoutX="135.0" layoutY="20.0" prefHeight="17.0" prefWidth="46.0" text="20" textAlignment="RIGHT" />
          </children>
       </AnchorPane>
       <Button fx:id="stop_button" disable="true" layoutX="117.0" layoutY="89.0" mnemonicParsing="false" onAction="#actionStop" text="%StopButtonText">
diff --git a/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
index 6f7dadd..b326fa8 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
@@ -169,7 +169,6 @@ class FXMLViewerController implements EventListener {
 	protected def actionStop() {
 		stop_button.setDisable(true);
 		launch_button.setDisable(false);
-		setup_button.setDisable(false);
 		this.ispace.emit(new Freeze(true));
 	}