Skip to content

Commit fec2655

Browse files
committed
Apply @JLLeitschuh patch
1 parent aa2f7c1 commit fec2655

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import edu.wpi.grip.ui.util.DPIUtility;
1717
import javafx.application.Platform;
1818
import javafx.fxml.FXML;
19-
import javafx.fxml.FXMLLoader;
2019
import javafx.scene.Parent;
2120
import javafx.scene.Scene;
2221
import javafx.scene.control.ButtonType;
@@ -53,6 +52,8 @@ public class MainWindowController {
5352
@FXML
5453
private Pane deployPane;
5554
@FXML
55+
private Pane aboutPane;
56+
@FXML
5657
private StatusBar statusBar;
5758
@Inject
5859
private EventBus eventBus;
@@ -215,9 +216,8 @@ public void showProjectSettingsEditor() {
215216

216217
@FXML
217218
public void showProjectAboutDialog() throws IOException {
218-
Parent about = FXMLLoader.load(Main.class.getResource("AboutDialog.fxml"));
219219
Stage aboutDialogStage = new Stage();
220-
aboutDialogStage.setScene(new Scene(about));
220+
aboutDialogStage.setScene(new Scene(aboutPane));
221221
aboutDialogStage.initModality(Modality.APPLICATION_MODAL);
222222
aboutDialogStage.show();
223223
}

ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
</children>
166166
<fx:define>
167167
<fx:include source="Deploy.fxml" fx:id="deployPane"/>
168+
<fx:include source="AboutDialog.fxml" fx:id="aboutPane"/>
168169
</fx:define>
169170
<stylesheets>
170171
<URL value="@roboto/Roboto.css"/>

0 commit comments

Comments
 (0)