exo/game-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(demo): introduce margin constants for consistent layout in DemoModule

Browse Source
This commit is contained in:
extio-de
2026-01-03 11:27:18 +01:00
parent 1315aaa67d
commit 5691ce2b03
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/extio/game_engine/renderer/container/Window.java
View File

@@ -41,6 +41,11 @@ import de.extio.game_engine.spatial2.model.MutableCoordI2;
@Scope("prototype") @Scope("prototype")
public class Window extends AbstractClientModule implements InitializingBean { public class Window extends AbstractClientModule implements InitializingBean {
public static final int MARGIN_TOP = 30;
public static final int MARGIN_LEFT = 20;
public static final int MARGIN_RIGHT = 20;
public static final int MARGIN_BOTTOM = 20;
protected final static List<Window> DISPLAYED_CONTAINERS = Collections.synchronizedList(new ArrayList<>()); protected final static List<Window> DISPLAYED_CONTAINERS = Collections.synchronizedList(new ArrayList<>());
protected final ModuleService moduleService; protected final ModuleService moduleService;

44
src/test/java/de/extio/game_engine/demo/DemoModule.java
View File

@@ -226,12 +226,12 @@ public class DemoModule extends AbstractClientModule {
.setType(LabelControl.class) .setType(LabelControl.class)
.setVisible(true) .setVisible(true)
.setEnabled(true) .setEnabled(true)
.withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(20).getX(), 60) .withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT).getX(), 60)
.withPositionRelative(10, 100); .withPositionRelative(Window.MARGIN_LEFT, 100);
this.mainWindow.putRenderingBo(bo); this.mainWindow.putRenderingBo(bo);
final var buttonX = Math.max(0, this.mainWindow.getNormalizedDimension().getX() - 64 - 21); final var buttonX = Math.max(0, this.mainWindow.getNormalizedDimension().getX() - 64 - Window.MARGIN_RIGHT - 1);
final var buttonY = 20; final var buttonY = Window.MARGIN_TOP;
bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_Audio", ControlRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_Audio", ControlRenderingBo.class)
.setCaption("") .setCaption("")
.setType(ButtonControl.class) .setType(ButtonControl.class)
@@ -258,8 +258,8 @@ public class DemoModule extends AbstractClientModule {
.setType(LabelControl.class) .setType(LabelControl.class)
.setVisible(true) .setVisible(true)
.setEnabled(true) .setEnabled(true)
.withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(20).getX(), 120) .withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT).getX(), 120)
.withPositionRelative(10, 480); .withPositionRelative(Window.MARGIN_LEFT, 480);
this.mainWindow.putRenderingBo(bo); this.mainWindow.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Label_Language", ControlRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Label_Language", ControlRenderingBo.class)
@@ -268,8 +268,8 @@ public class DemoModule extends AbstractClientModule {
.setType(LabelControl.class) .setType(LabelControl.class)
.setVisible(true) .setVisible(true)
.setEnabled(true) .setEnabled(true)
.withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(20).getX(), 120) .withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT).getX(), 120)
.withPositionRelative(10, 580); .withPositionRelative(Window.MARGIN_LEFT, 580);
this.mainWindow.putRenderingBo(bo); this.mainWindow.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_ScrollDemo", ControlRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_ScrollDemo", ControlRenderingBo.class)
@@ -278,8 +278,8 @@ public class DemoModule extends AbstractClientModule {
.setType(LabelControl.class) .setType(LabelControl.class)
.setVisible(true) .setVisible(true)
.setEnabled(true) .setEnabled(true)
.withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(20).getX(), 120) .withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(9).multiply(7).substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT).getX(), 120)
.withPositionRelative(10, 690); .withPositionRelative(Window.MARGIN_LEFT, 690);
this.mainWindow.putRenderingBo(bo); this.mainWindow.putRenderingBo(bo);
} }
@@ -308,8 +308,8 @@ public class DemoModule extends AbstractClientModule {
return; return;
} }
final var buttonX = Math.max(0, this.mainWindow.getNormalizedDimension().getX() - 64 - 21); final var buttonX = Math.max(0, this.mainWindow.getNormalizedDimension().getX() - 64 - Window.MARGIN_RIGHT - 1);
final var buttonY = 20; final var buttonY = Window.MARGIN_TOP;
final DrawImageRenderingBo overlayBo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_Audio_Overlay", DrawImageRenderingBo.class); final DrawImageRenderingBo overlayBo = this.renderingBoPool.acquire("DemoModule_MainWindow_Button_Audio_Overlay", DrawImageRenderingBo.class);
overlayBo.setResource(new StaticResource(List.of("gfx"), "decline.png")); overlayBo.setResource(new StaticResource(List.of("gfx"), "decline.png"));
overlayBo.withDimensionAbsolute(64, 64); overlayBo.withDimensionAbsolute(64, 64);
@@ -330,8 +330,8 @@ public class DemoModule extends AbstractClientModule {
.setText(this.localizationService.translate("test-5").replace("\\n", "\n")) .setText(this.localizationService.translate("test-5").replace("\\n", "\n"))
.setSize(32) .setSize(32)
.setAlignment(HorizontalAlignment.CENTER) .setAlignment(HorizontalAlignment.CENTER)
.withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(7).multiply(2).substract(20).getX(), 40) .withDimensionAbsolute(RendererControl.REFERENCE_RESOLUTION.divide(7).multiply(2).substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT).getX(), 40)
.withPositionRelative(10, 50); .withPositionRelative(Window.MARGIN_LEFT, 50);
this.secondaryWindow.putRenderingBo(bo); this.secondaryWindow.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_SecondaryWindow_Button_Ok", ControlRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_SecondaryWindow_Button_Ok", ControlRenderingBo.class)
@@ -349,8 +349,8 @@ public class DemoModule extends AbstractClientModule {
final var themes = this.themeManager.getAvailableThemeNames(); final var themes = this.themeManager.getAvailableThemeNames();
final var paddingX = 24; final var paddingX = Window.MARGIN_LEFT;
final var paddingBottom = 24; final var paddingBottom = Window.MARGIN_BOTTOM;
final var columns = 2; final var columns = 2;
final var columnGap = 16; final var columnGap = 16;
final var buttonWidth = 340; final var buttonWidth = 340;
@@ -411,8 +411,8 @@ public class DemoModule extends AbstractClientModule {
final var languages = this.localizationService.getLanguages(); final var languages = this.localizationService.getLanguages();
final var title = "Select Language"; final var title = "Select Language";
final var paddingX = 20; final var paddingX = Window.MARGIN_LEFT;
final var paddingBottom = 24; final var paddingBottom = Window.MARGIN_BOTTOM;
final var columns = 2; final var columns = 2;
final var columnGap = 24; final var columnGap = 24;
final var buttonWidth = 340; final var buttonWidth = 340;
@@ -473,12 +473,12 @@ public class DemoModule extends AbstractClientModule {
.setText(this.localizationService.translate("test-8")) .setText(this.localizationService.translate("test-8"))
.setSize(28) .setSize(28)
.setAlignment(HorizontalAlignment.CENTER) .setAlignment(HorizontalAlignment.CENTER)
.withDimensionAbsolute(this.scrollAreaWindow.getNormalizedDimension().getX() - 40, 50) .withDimensionAbsolute(this.scrollAreaWindow.getNormalizedDimension().getX() - (Window.MARGIN_LEFT + Window.MARGIN_RIGHT), 50)
.withPositionRelative(20, 30); .withPositionRelative(Window.MARGIN_LEFT, Window.MARGIN_TOP);
this.scrollAreaWindow.putRenderingBo(bo); this.scrollAreaWindow.putRenderingBo(bo);
this.scrollArea.setRelativePosition(ImmutableCoordI2.create(20, 65)); this.scrollArea.setRelativePosition(ImmutableCoordI2.create(Window.MARGIN_LEFT, 65));
this.scrollArea.setDimension(this.scrollAreaWindow.getNormalizedDimension().substract(40, 90)); this.scrollArea.setDimension(this.scrollAreaWindow.getNormalizedDimension().substract(Window.MARGIN_LEFT + Window.MARGIN_RIGHT, 90));
for (var i = 0; i < 20; i++) { for (var i = 0; i < 20; i++) {
final var y = i * 70 + 1; final var y = i * 70 + 1;