Fix: Correct fxml imports and restore branch state"

Co-authored-by: Copilot <copilot@github.com>
2026-04-22 17:51:35 +02:00
parent 4e675677c0
commit ffbfd2dee4
6 changed files with 9 additions and 12 deletions
@@ -3,11 +3,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController?>
 <!-- movable taskbar -->
 <HBox xmlns="http://javafx.com/javafx/21"
      xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="TaskbarController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController"
      fx:id="taskbar"
      styleClass="taskbar"
      spacing="15"