Merge pull request 'Update dependency tools.jackson.dataformat:jackson-dataformat-toml to v3.2.0' (#16) from renovate/all-minor-patch into master

.gitea/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
 
       - name: Set up JDK
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5

build.gradle.kts

@@ -7,10 +7,10 @@ plugins {
 group = "be.seeseemelk"
 version = "1.0-SNAPSHOT"
 
-val gdxVersion = "1.14.0"
+val gdxVersion = "1.14.2"
 val slf4j = "2.0.18"
 val lombokVersion = "1.18.46"
-val avajeInjectVersion = "12.5"
+val avajeInjectVersion = "12.6-javax"
 
 application {
     mainClass = "be.seeseemelk.diceos.Bootloader"
@@ -39,14 +39,14 @@ dependencies {
     testAnnotationProcessor("io.avaje:avaje-inject-generator:${avajeInjectVersion}")
 
     // Parsing TOML files
-    implementation("tools.jackson.dataformat:jackson-dataformat-toml:3.1.3")
+    implementation("tools.jackson.dataformat:jackson-dataformat-toml:3.2.0")
 
     // LibGDX
     api("com.badlogicgames.gdx:gdx:$gdxVersion")
     api("com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion")
     api("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop")
 
-    testImplementation(platform("org.junit:junit-bom:6.0.3"))
+    testImplementation(platform("org.junit:junit-bom:6.1.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

src/main/java/be/seeseemelk/diceos/system/WindowService.java

@@ -69,13 +69,13 @@ public class WindowService implements OnStartup {
 
         // Render menubar items
         gc.save();
-        gc.translate(5, 0);
+        gc.translate(8, 0);
         for (var submenu : menu.getItems()) {
             gc.save();
             gc.clip(0, 0, submenu.getWidth(), submenu.getHeight());
             submenu.paint(gc);
             gc.restore();
-            gc.translate(submenu.getWidth() + 4, 0);
+            gc.translate(submenu.getWidth(), 0);
         }
         gc.restore();
     }

src/main/java/be/seeseemelk/diceos/system/gfx/GraphicsContext.java

@@ -110,6 +110,14 @@ public class GraphicsContext {
         batch.setColor(r / 255f, g / 255f, b / 255f, 1f);
     }
 
+    /**
+     * Sets the color for subsequent drawing operations using an RGB integer.
+     * @param rgb The RGB color integer.
+     */
+    public void setColour(int rgb) {
+        setColour((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF);
+    }
+
     /**
      * Shifts the context to the right and down by some amount.
      * Negative values move towards the opposite direction.
@@ -154,7 +162,7 @@ public class GraphicsContext {
      * @param height The height of the clipping area.
      */
     public void clip(int x, int y, int width, int height) {
-        var scissors = new Rectangle(x, getHeight() - y - height, width - getXTranslation(), height - getYTranslation());
+        var scissors = new Rectangle(x + getXTranslation(), getHeight() - (y + getYTranslation()) - height, width, height);
         ScissorStack.calculateScissors(camera, batch.getTransformMatrix(), scissors, scissors);
         batch.flush();
         if (ScissorStack.pushScissors(scissors)) {

src/main/java/be/seeseemelk/diceos/system/toolkit/menu/Menu.java

@@ -3,6 +3,7 @@ package be.seeseemelk.diceos.system.toolkit.menu;
 import be.seeseemelk.diceos.system.DiceOS;
 import be.seeseemelk.diceos.system.font.Font;
 import be.seeseemelk.diceos.system.gfx.GraphicsContext;
+import be.seeseemelk.diceos.system.toolkit.Window;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,8 @@ import java.util.List;
 @Getter
 @Slf4j
 public class Menu implements MenuItem {
+    private final static int HORIZONTAL_PADDING = 2;
+
     private final String title;
     private final List<MenuItem> items = new ArrayList<>();
     private final Font font = DiceOS.getResourceLoader().getDefaultFont();
@@ -30,7 +33,7 @@ public class Menu implements MenuItem {
 
     @Override
     public int getWidth() {
-        return font.getTextWidth(title);
+        return font.getTextWidth(title) + HORIZONTAL_PADDING * 2;
     }
 
     @Override
@@ -43,23 +46,23 @@ public class Menu implements MenuItem {
      *
      * @param x The x-coordinate.
      * @param y The y-coordinate.
-     * @return The created MenuPopup.
+     * @return The created Window for the menu.
      */
-    public MenuPopup show(int x, int y) {
+    public Window show(int x, int y) {
-        return new MenuPopup(this, x, y);
+        return new Window(x, y, getWidth(), getHeight(), Window.Style.NONE);
     }
 
     @Override
     public void paint(GraphicsContext gc) {
         if (DiceOS.getInputService().mouseInBounds(gc.getXTranslation(), gc.getYTranslation(), getWidth(), getHeight())) {
             log.info("Mouse in bounds");
-            gc.setColour(0, 0, 255);
+            gc.setColour(0x9f7445);
+            gc.fillRect(-100, -100, 500, 500);
         }
 
-        gc.fillRect(-100, -100, 500, 500);
         gc.setColour(255, 255, 255);
 
         // Renders the menu as a simple menu button
-        gc.draw(title, 2, 5);
+        gc.draw(title, HORIZONTAL_PADDING, 5);
     }
 }

src/main/java/be/seeseemelk/diceos/system/toolkit/menu/MenuPopup.java

@@ -1,16 +0,0 @@
-package be.seeseemelk.diceos.system.toolkit.menu;
-
-import be.seeseemelk.diceos.system.toolkit.Window;
-
-/**
- * A visisble menu popup.
- */
-public class MenuPopup {
-    private final Menu menu;
-    private final Window window;
-
-    public MenuPopup(Menu menu, int x, int y) {
-        this.menu = menu;
-        this.window = new Window(x, y, menu.getWidth(), menu.getHeight(), Window.Style.NONE);
-    }
-}

src/test/java/be/seeseemelk/diceos/system/gfx/GraphicsContextTest.java

@@ -57,6 +57,12 @@ class GraphicsContextTest {
         verify(batch).setColor(1f, 0f, 0f, 1f);
     }
 
+    @Test
+    void testSetColourRGB() {
+        gc.setColour(0xFF00FF);
+        verify(batch).setColor(1f, 0f, 1f, 1f);
+    }
+
     @Test
     void testTranslate() {
         gc.translate(10, 20);