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

fix(renderer): update color settings for toggled state in CustomButton and CustomSwitch

Browse Source 
feat(demo): add Switch and update Button control types in DemoModule
This commit is contained in:
extio-de
2025-12-29 21:57:23 +01:00
parent eb0b2d853c
commit be625f9dce
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomButton.java
View File

@@ -84,7 +84,7 @@ public class CustomButton extends CustomAbstractButton {
g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor()); g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor());
} }
else if ((this.state & STATE_TOGGLED) != 0) { else if ((this.state & STATE_TOGGLED) != 0) {
g2d.setColor(theme.getSelectionPrimary().toColor()); g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor());
} }
else if (this.isEnabled()) { else if (this.isEnabled()) {
g2d.setColor(theme.getTextNormal().toColor()); g2d.setColor(theme.getTextNormal().toColor());

3
src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomSwitch.java
View File

@@ -85,7 +85,7 @@ public class CustomSwitch extends CustomAbstractButton {
g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor()); g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor());
} }
else if ((this.state & STATE_TOGGLED) != 0) { else if ((this.state & STATE_TOGGLED) != 0) {
g2d.setColor(theme.getSelectionPrimary().toColor()); g2d.setColor(theme.getTextNormal().adjustBrightness(theme.getHoverBrightnessAdjustment()).toColor());
} }
else if (this.isEnabled()) { else if (this.isEnabled()) {
g2d.setColor(theme.getTextNormal().toColor()); g2d.setColor(theme.getTextNormal().toColor());
@@ -93,7 +93,6 @@ public class CustomSwitch extends CustomAbstractButton {
else { else {
g2d.setColor(theme.getTextDisabled().toColor()); g2d.setColor(theme.getTextDisabled().toColor());
} }
final var textDim = G2DDrawFont.getTextDimensions(this.caption, g2d, this.fontSize, this.scaleFactor); final var textDim = G2DDrawFont.getTextDimensions(this.caption, g2d, this.fontSize, this.scaleFactor);
G2DDrawFont.renderText(g2d, G2DDrawFont.renderText(g2d,
textDim, textDim,

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

@@ -20,6 +20,8 @@ import de.extio.game_engine.renderer.model.RenderingBoLayer;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.ButtonControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.ButtonControl;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.LabelControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.LabelControl;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.SwitchControl;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.ToggleButtonControl;
import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo;
import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBoEffects; import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBoEffects;
import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo; import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo;
@@ -495,10 +497,10 @@ public class DemoModule extends AbstractClientModule {
bo = this.renderingBoPool.acquire("DemoModule_ScrollAreaWindow_Text_" + i, DrawFontRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_ScrollAreaWindow_Text_" + i, DrawFontRenderingBo.class)
.setText(String.valueOf(i)) .setText(String.valueOf(i))
.setSize(28) .setSize(28)
.setAlignment(HorizontalAlignment.LEFT) .setAlignment(HorizontalAlignment.CENTER)
.withDimensionAbsolute(150, 60) .withDimensionAbsolute(50, 60)
.setLayer(RenderingBoLayer.UI0) .setLayer(RenderingBoLayer.UI0)
.withPositionRelative(250, y + 22); .withPositionRelative(100, y + 22);
this.scrollArea.putRenderingBo(bo); this.scrollArea.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_ScrollAreaWindow_Effect_" + i, DrawEffectRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_ScrollAreaWindow_Effect_" + i, DrawEffectRenderingBo.class)
@@ -506,17 +508,27 @@ public class DemoModule extends AbstractClientModule {
.setEffect(DrawEffectRenderingBoEffects.DECORATIVE_BORDER_FILLED) .setEffect(DrawEffectRenderingBoEffects.DECORATIVE_BORDER_FILLED)
.setCustomInt0(4) .setCustomInt0(4)
.setLayer(RenderingBoLayer.UI0) .setLayer(RenderingBoLayer.UI0)
.withPositionRelative(350, y); .withPositionRelative(200, y);
this.scrollArea.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_ScrollArea_Switch_" + i, ControlRenderingBo.class)
.setCaption("Switch " + (i + 1))
.setFontSize(24)
.setType(SwitchControl.class)
.setVisible(true)
.setEnabled(true)
.withDimensionAbsolute(250, 60)
.withPositionRelative(300, y + 2);
this.scrollArea.putRenderingBo(bo); this.scrollArea.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_ScrollArea_Button_" + i, ControlRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_ScrollArea_Button_" + i, ControlRenderingBo.class)
.setCaption("Button " + (i + 1)) .setCaption("Button " + (i + 1))
.setFontSize(24) .setFontSize(24)
.setType(ButtonControl.class) .setType(ToggleButtonControl.class)
.setVisible(true) .setVisible(true)
.setEnabled(true) .setEnabled(true)
.withDimensionAbsolute(200, 60) .withDimensionAbsolute(150, 60)
.withPositionRelative(500, y + 2); .withPositionRelative(550, y + 2);
this.scrollArea.putRenderingBo(bo); this.scrollArea.putRenderingBo(bo);
bo = this.renderingBoPool.acquire("DemoModule_ScrollArea_Image_" + i, DrawImageRenderingBo.class) bo = this.renderingBoPool.acquire("DemoModule_ScrollArea_Image_" + i, DrawImageRenderingBo.class)