update fx2j to 0.1.0 (#3209)

FAForever · Jun 18, 2024 · c518771 · c518771
1 parent b2faaa5
commit c518771
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
   id("java")
   id("distribution")
   id("me.champeau.jmh") version "0.7.2"
-  id("io.github.sheikah45.fx2j") version "0.0.0"
+  id("io.github.sheikah45.fx2j") version "0.1.0"
   id("com.adarshr.test-logger") version "4.0.0"
 }
 

diff --git a/src/main/resources/theme/chat/color_picker_menu_item.fxml b/src/main/resources/theme/chat/color_picker_menu_item.fxml
@@ -1,4 +1,4 @@
-<?controllerType com.faforever.client.fx.contextmenu.AbstractColorPickerCustomMenuItemController?>
+<?fx2jControllerType com.faforever.client.fx.contextmenu.AbstractColorPickerCustomMenuItemController?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.CustomMenuItem?>

diff --git a/src/main/resources/theme/filter/filter.fxml b/src/main/resources/theme/filter/filter.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?controllerType com.faforever.client.filter.AbstractFilterController?>
+<?fx2jControllerType com.faforever.client.filter.AbstractFilterController?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.SplitPane?>

diff --git a/src/main/resources/theme/filter/range_slider_filter.fxml b/src/main/resources/theme/filter/range_slider_filter.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?controllerType com.faforever.client.filter.AbstractRangeSliderFilterController?>
+<?fx2jControllerType com.faforever.client.filter.AbstractRangeSliderFilterController?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CustomMenuItem?>
 <?import javafx.scene.control.Label?>

diff --git a/src/main/resources/theme/headerbar/header_bar.fxml b/src/main/resources/theme/headerbar/header_bar.fxml
@@ -13,10 +13,10 @@
     <children>
         <fx:include fx:id="mainMenuButton" source="main_menu_button.fxml"/>
         <HBox fx:id="leftMenuPane" minWidth="10.0">
+            <fx:define>
+                <ToggleGroup fx:id="mainNavigation"/>
+            </fx:define>
             <children>
-                <fx:define>
-                    <ToggleGroup fx:id="mainNavigation"/>
-                </fx:define>
                 <ToggleButton fx:id="newsButton" minWidth="-Infinity" mnemonicParsing="false"
                               onAction="#onNavigateButtonClicked" styleClass="main-navigation-button"
                               text="%main.news" toggleGroup="$mainNavigation"/>

diff --git a/src/main/resources/theme/vault/vault_entity.fxml b/src/main/resources/theme/vault/vault_entity.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?controllerType com.faforever.client.vault.VaultEntityController?>
+<?fx2jControllerType com.faforever.client.vault.VaultEntityController?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>