klmp200/sarl-fireworks
1
0
Fork 0
mirror of https://github.com/klmp200/sarl-fireworks.git synced 2024-11-21 14:23:19 +00:00
Code Issues Releases Wiki Activity

Fix unexpected Stop button behavior

Browse Source
This commit is contained in:
Antoine Bartuccio 2017-06-15 12:10:05 +02:00
parent c3574a7075
commit 20027dd8ae
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
View File

@ -25,14 +25,14 @@
<tooltip> <tooltip>
<Tooltip text="%GravityTooltip" /> <Tooltip text="%GravityTooltip" />
</tooltip></ScrollBar> </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" /> <Label layoutY="17.0" prefHeight="17.0" prefWidth="46.0" text="%GravityLabelText" />
</children> </children>
</AnchorPane> </AnchorPane>
<AnchorPane layoutX="27.0" layoutY="255.0"> <AnchorPane layoutX="27.0" layoutY="255.0">
<children> <children>
<Label layoutX="4.0" layoutY="17.0" text="%FireQuantityLabelText" /> <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"> <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>
<Tooltip text="%FireQuantityTooltip" /> <Tooltip text="%FireQuantityTooltip" />
@ -46,7 +46,7 @@
<Tooltip text="%RocketQuantityTooltip" /> <Tooltip text="%RocketQuantityTooltip" />
</tooltip></ScrollBar> </tooltip></ScrollBar>
<Label layoutY="20.0" text="%RocketQuantityLabelText" /> <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> </children>
</AnchorPane> </AnchorPane>
<Button fx:id="stop_button" disable="true" layoutX="117.0" layoutY="89.0" mnemonicParsing="false" onAction="#actionStop" text="%StopButtonText"> <Button fx:id="stop_button" disable="true" layoutX="117.0" layoutY="89.0" mnemonicParsing="false" onAction="#actionStop" text="%StopButtonText">

1
src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
View File

@ -169,7 +169,6 @@ class FXMLViewerController implements EventListener {
protected def actionStop() { protected def actionStop() {
stop_button.setDisable(true); stop_button.setDisable(true);
launch_button.setDisable(false); launch_button.setDisable(false);
setup_button.setDisable(false);
this.ispace.emit(new Freeze(true)); this.ispace.emit(new Freeze(true));
} }