mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 14:28:43 +00:00
Multiple fixes:
- fix last button no longer default focused when loading keybinding dialog - fix click and mouse exit still focused on button - closing keybinding does not focus on chat anymore #story[1273]
This commit is contained in:
Zhi You Tan
@@ -221,6 +221,7 @@ public class ViewManager {
|
|||||||
.getController();
|
.getController();
|
||||||
keyBindingDialogController.setGameClient(this.gameClient);
|
keyBindingDialogController.setGameClient(this.gameClient);
|
||||||
keyBindingDialog.show();
|
keyBindingDialog.show();
|
||||||
|
decorator.requestFocus();
|
||||||
Sounds.playButtonClick();
|
Sounds.playButtonClick();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-5
@@ -71,8 +71,7 @@ public class KeyBindingDialogController implements Initializable {
|
|||||||
buttons = new ArrayList<>();
|
buttons = new ArrayList<>();
|
||||||
Collections.addAll(buttons,
|
Collections.addAll(buttons,
|
||||||
zoomInbtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
|
zoomInbtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
|
||||||
viewButton,
|
viewButton, rightButton, leftButton, forwardButton, backwardButton);
|
||||||
rightButton, leftButton, forwardButton, backwardButton);
|
|
||||||
bindButtonWithAction();
|
bindButtonWithAction();
|
||||||
loadKeyBind();
|
loadKeyBind();
|
||||||
|
|
||||||
@@ -91,9 +90,6 @@ public class KeyBindingDialogController implements Initializable {
|
|||||||
});
|
});
|
||||||
|
|
||||||
closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
|
closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
|
||||||
|
|
||||||
keyBindingDialogHeader.setFocusTraversable(true);
|
|
||||||
keyBindingDialogHeader.requestFocus();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -161,6 +157,7 @@ public class KeyBindingDialogController implements Initializable {
|
|||||||
+ "-fx-background-color: -fx-pp-front-color; "
|
+ "-fx-background-color: -fx-pp-front-color; "
|
||||||
+ "-fx-text-fill: -fx-pp-theme-color; "
|
+ "-fx-text-fill: -fx-pp-theme-color; "
|
||||||
+ "-fx-font-size: 13;");
|
+ "-fx-font-size: 13;");
|
||||||
|
keyBindingDialogHeader.requestFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -7,17 +7,16 @@
|
|||||||
<?import javafx.scene.control.Label?>
|
<?import javafx.scene.control.Label?>
|
||||||
<?import javafx.scene.image.Image?>
|
<?import javafx.scene.image.Image?>
|
||||||
<?import javafx.scene.image.ImageView?>
|
<?import javafx.scene.image.ImageView?>
|
||||||
<?import javafx.scene.layout.AnchorPane?>
|
|
||||||
<?import javafx.scene.layout.ColumnConstraints?>
|
<?import javafx.scene.layout.ColumnConstraints?>
|
||||||
<?import javafx.scene.layout.GridPane?>
|
<?import javafx.scene.layout.GridPane?>
|
||||||
<?import javafx.scene.layout.Pane?>
|
<?import javafx.scene.layout.Pane?>
|
||||||
<?import javafx.scene.layout.RowConstraints?>
|
<?import javafx.scene.layout.RowConstraints?>
|
||||||
<?import javafx.scene.layout.StackPane?>
|
<?import javafx.scene.layout.StackPane?>
|
||||||
<?import javafx.scene.text.Font?>
|
<?import javafx.scene.text.Font?>
|
||||||
|
|
||||||
<StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
|
<StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
|
||||||
maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
|
maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
|
||||||
prefHeight="800.0" prefWidth="1200.0"
|
prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8.0.111"
|
||||||
style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8"
|
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
fx:controller="seng302.visualiser.controllers.RaceViewController">
|
fx:controller="seng302.visualiser.controllers.RaceViewController">
|
||||||
<children>
|
<children>
|
||||||
@@ -38,17 +37,15 @@
|
|||||||
valignment="BOTTOM" vgrow="SOMETIMES"/>
|
valignment="BOTTOM" vgrow="SOMETIMES"/>
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0"
|
<GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0" styleClass="timer">
|
||||||
styleClass="timer">
|
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
|
<ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
|
||||||
prefWidth="50.0"/>
|
prefWidth="50.0"/>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0"
|
<ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
|
||||||
minWidth="135.0" prefWidth="135.0"/>
|
prefWidth="135.0"/>
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints minHeight="10.0" prefHeight="30.0"
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
|
||||||
vgrow="SOMETIMES"/>
|
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<opaqueInsets>
|
<opaqueInsets>
|
||||||
<Insets/>
|
<Insets/>
|
||||||
@@ -80,25 +77,20 @@
|
|||||||
</GridPane>
|
</GridPane>
|
||||||
<GridPane GridPane.columnIndex="2">
|
<GridPane GridPane.columnIndex="2">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
|
||||||
prefWidth="100.0"/>
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
|
|
||||||
prefWidth="100.0"/>
|
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints minHeight="10.0" prefHeight="30.0"
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
|
||||||
vgrow="SOMETIMES"/>
|
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
<GridPane fx:id="chatGridPane" GridPane.columnIndex="2"
|
<GridPane fx:id="chatGridPane" GridPane.columnIndex="2" GridPane.rowIndex="2">
|
||||||
GridPane.rowIndex="2">
|
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0"
|
<ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
|
||||||
minWidth="390.0" prefWidth="390.0"/>
|
prefWidth="390.0"/>
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints maxHeight="1.7976931348623157E308"
|
<RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
|
||||||
vgrow="SOMETIMES"/>
|
|
||||||
<RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
|
<RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
|
||||||
vgrow="SOMETIMES"/>
|
vgrow="SOMETIMES"/>
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
@@ -121,22 +113,21 @@
|
|||||||
minWidth="90.0" prefWidth="90.0"/>
|
minWidth="90.0" prefWidth="90.0"/>
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints maxHeight="50.0" minHeight="50.0"
|
<RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0"
|
||||||
prefHeight="50.0" valignment="CENTER" vgrow="SOMETIMES"/>
|
valignment="CENTER" vgrow="SOMETIMES"/>
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<JFXButton fx:id="chatSend" alignment="CENTER"
|
<JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED"
|
||||||
buttonType="RAISED" maxHeight="-Infinity"
|
focusTraversable="false" maxHeight="-Infinity"
|
||||||
maxWidth="1.7976931348623157E308" minHeight="-Infinity"
|
maxWidth="1.7976931348623157E308" minHeight="-Infinity"
|
||||||
minWidth="-Infinity" prefHeight="35.0" text="SEND"
|
minWidth="-Infinity" prefHeight="35.0" text="SEND"
|
||||||
GridPane.columnIndex="1">
|
GridPane.columnIndex="1">
|
||||||
<GridPane.margin>
|
<GridPane.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0"
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
|
||||||
top="10.0"/>
|
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
</JFXButton>
|
</JFXButton>
|
||||||
<JFXTextField fx:id="chatInput" maxHeight="35.0"
|
<JFXTextField fx:id="chatInput" focusTraversable="false"
|
||||||
minHeight="-Infinity" prefHeight="35.0">
|
maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0">
|
||||||
<GridPane.margin>
|
<GridPane.margin>
|
||||||
<Insets bottom="10.0" left="20.0" right="10.0"/>
|
<Insets bottom="10.0" left="20.0" right="10.0"/>
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
@@ -158,29 +149,27 @@
|
|||||||
prefHeight="150.0" prefWidth="240.0" GridPane.halignment="CENTER"
|
prefHeight="150.0" prefWidth="240.0" GridPane.halignment="CENTER"
|
||||||
GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
|
GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0"
|
<ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0" minWidth="110.0"
|
||||||
minWidth="110.0" prefWidth="110.0"/>
|
prefWidth="110.0"/>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0"
|
<ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0" minWidth="10.0"
|
||||||
minWidth="10.0"
|
|
||||||
prefWidth="132.0"/>
|
prefWidth="132.0"/>
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints maxHeight="120.0" minHeight="120.0"
|
<RowConstraints maxHeight="120.0" minHeight="120.0" prefHeight="120.0"
|
||||||
prefHeight="120.0" vgrow="SOMETIMES"/>
|
vgrow="SOMETIMES"/>
|
||||||
<RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
|
<RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
|
||||||
vgrow="SOMETIMES"/>
|
vgrow="SOMETIMES"/>
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<Label fx:id="positionLabel" text="Position:"
|
<Label fx:id="positionLabel" text="Position:" GridPane.columnIndex="1"
|
||||||
GridPane.columnIndex="1" GridPane.halignment="LEFT"
|
GridPane.halignment="LEFT" GridPane.rowSpan="2" GridPane.valignment="TOP">
|
||||||
GridPane.rowSpan="2" GridPane.valignment="TOP">
|
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
|
<Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
|
||||||
</padding>
|
</padding>
|
||||||
</Label>
|
</Label>
|
||||||
<Label fx:id="boatSpeedLabel" text="Boat Speed:"
|
<Label fx:id="boatSpeedLabel" text="Boat Speed:" GridPane.columnIndex="1"
|
||||||
GridPane.columnIndex="1" GridPane.halignment="LEFT"
|
GridPane.halignment="LEFT" GridPane.rowSpan="2"
|
||||||
GridPane.rowSpan="2" GridPane.valignment="CENTER">
|
GridPane.valignment="CENTER">
|
||||||
<opaqueInsets>
|
<opaqueInsets>
|
||||||
<Insets/>
|
<Insets/>
|
||||||
</opaqueInsets>
|
</opaqueInsets>
|
||||||
@@ -189,8 +178,8 @@
|
|||||||
</padding>
|
</padding>
|
||||||
</Label>
|
</Label>
|
||||||
<Label fx:id="boatHeadingLabel" text="Boat Heading:"
|
<Label fx:id="boatHeadingLabel" text="Boat Heading:"
|
||||||
GridPane.columnIndex="1" GridPane.halignment="LEFT"
|
GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2"
|
||||||
GridPane.rowSpan="2" GridPane.valignment="BOTTOM">
|
GridPane.valignment="BOTTOM">
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
|
<Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
|
||||||
</padding>
|
</padding>
|
||||||
@@ -203,12 +192,12 @@
|
|||||||
<rowConstraints>
|
<rowConstraints>
|
||||||
<RowConstraints maxHeight="120.0" minHeight="120.0"
|
<RowConstraints maxHeight="120.0" minHeight="120.0"
|
||||||
prefHeight="120.0" vgrow="SOMETIMES"/>
|
prefHeight="120.0" vgrow="SOMETIMES"/>
|
||||||
<RowConstraints maxHeight="30.0" minHeight="30.0"
|
<RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
|
||||||
prefHeight="30.0" vgrow="SOMETIMES"/>
|
vgrow="SOMETIMES"/>
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<ImageView fx:id="windImageView" fitHeight="92.0"
|
<ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
|
||||||
fitWidth="109.0" pickOnBounds="true" preserveRatio="true"
|
pickOnBounds="true" preserveRatio="true"
|
||||||
GridPane.halignment="CENTER" GridPane.rowSpan="2"
|
GridPane.halignment="CENTER" GridPane.rowSpan="2"
|
||||||
GridPane.valignment="CENTER"/>
|
GridPane.valignment="CENTER"/>
|
||||||
<Label fx:id="windSpeedLabel" text="0.0 Knots"
|
<Label fx:id="windSpeedLabel" text="0.0 Knots"
|
||||||
|
|||||||
Reference in New Issue
Block a user