fix: UI loaded from fxml file now correctly loads Image tags, closes #1343

AlmasB · AlmasB · commit 6ce37832a20b · 2024-02-19T18:45:22.000Z
diff --git a/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt b/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt
@@ -785,7 +785,7 @@ private class UIAssetLoader : AssetLoader<UI>(
         val controller = (params as UIParams).controller
 
         params.url.openStream().use {
-            val loader = FXMLLoader()
+            val loader = FXMLLoader(params.url)
             loader.setController(controller)
             val root = loader.load<Parent>(it)
             controller.init()
diff --git a/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt b/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt
@@ -17,6 +17,7 @@ import com.almasb.fxgl.test.InjectInTest
 import com.almasb.fxgl.test.RunWithFX
 import com.almasb.fxgl.texture.getDummyImage
 import com.almasb.fxgl.ui.UIController
+import javafx.scene.image.ImageView
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.*
@@ -321,6 +322,21 @@ class AssetLoaderServiceTest {
         assertThat(ui.root, `is`(notNullValue()))
     }
 
+    @Test
+    fun `Load UI with image element`() {
+        val controller = object : UIController {
+            override fun init() {
+            }
+        }
+
+        val ui = assetLoader.loadUI("fxml/test_ui_with_image.fxml", controller)
+
+        val imageView = ui.root.lookup("#imageView") as ImageView
+
+        assertThat(imageView, `is`(notNullValue()))
+        assertThat(imageView.image, `is`(notNullValue()))
+    }
+
     @Test
     fun loadCSS() {
         var css = assetLoader.loadCSS("test.css")
diff --git a/fxgl/src/test/resources/fxglassets/ui/fxml/test.png b/fxgl/src/test/resources/fxglassets/ui/fxml/test.png
diff --git a/fxgl/src/test/resources/fxglassets/ui/fxml/test_ui_with_image.fxml b/fxgl/src/test/resources/fxglassets/ui/fxml/test_ui_with_image.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.Pane?>
+
+<Pane xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+    <ImageView id="imageView">
+        <Image url="@test.png"/>
+    </ImageView>
+</Pane>
