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

refactor(renderer): simplify G2DTextfieldControlImpl2 by removing multi-line support and associated components

Browse Source
This commit is contained in:
extio-de
2026-01-25 18:38:44 +01:00
parent b3ce53e06d
commit b570276e1b
1 changed files with 28 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

253
src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java
View File

@@ -2,17 +2,13 @@ package de.extio.game_engine.renderer.g2d.control.impl;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.text.JTextComponent;
import de.extio.game_engine.renderer.RendererData; import de.extio.game_engine.renderer.RendererData;
import de.extio.game_engine.renderer.ThemeManager; import de.extio.game_engine.renderer.ThemeManager;
import de.extio.game_engine.renderer.g2d.G2DRenderer; import de.extio.game_engine.renderer.g2d.G2DRenderer;
import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont; import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
import de.extio.game_engine.renderer.g2d.control.components.CustomJTextArea;
import de.extio.game_engine.renderer.g2d.control.components.CustomJTextField; import de.extio.game_engine.renderer.g2d.control.components.CustomJTextField;
import de.extio.game_engine.renderer.g2d.theme.G2DThemeManager; import de.extio.game_engine.renderer.g2d.theme.G2DThemeManager;
import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl; import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
@@ -23,18 +19,10 @@ import de.extio.game_engine.renderer.model.event.UiControlEvent;
public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements TextfieldControl { public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements TextfieldControl {
private JTextComponent textComponent; private CustomJTextField textComponent;
// private CustomJScrollPane scrollPane;
private final G2DSliderControlImpl scrollbar;
private boolean multiLine;
private boolean readonly; private boolean readonly;
private String lastCaption = "";
private long lastCaptionUpdateTime; private long lastCaptionUpdateTime;
private long lastCaptionUpdateTimeInternal; private long lastCaptionUpdateTimeInternal;
@@ -43,23 +31,15 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
protected RgbaColor backgroundColor; protected RgbaColor backgroundColor;
private boolean scrollPositionModified;
private double scrollPositionPerc = 0.0;
@Override @Override
public void setCustomData(final TextfieldData data) { public void setCustomData(final TextfieldData data) {
if (data != null) { if (data != null) {
this.setMultiLine(data.multiLine());
this.setReadonly(data.readonly()); this.setReadonly(data.readonly());
this.setBackgroundColor(data.backgroundColor()); this.setBackgroundColor(data.backgroundColor());
} }
} }
public G2DTextfieldControlImpl2() { public G2DTextfieldControlImpl2() {
this.scrollbar = new G2DSliderControlImpl(value -> {
this.onScroll(value.doubleValue());
});
} }
private void setBackgroundColor(final RgbaColor color) { private void setBackgroundColor(final RgbaColor color) {
@@ -67,15 +47,6 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
this.backgroundColor = color; this.backgroundColor = color;
} }
private void setMultiLine(final boolean multiLine) {
if (this.textComponent == null) {
this.multiLine = multiLine;
}
else {
// throw new UnsupportedOperationException("Multiline property is read-only after initial control creation");
}
}
private void setReadonly(final boolean readonly) { private void setReadonly(final boolean readonly) {
this.modified |= readonly != this.readonly; this.modified |= readonly != this.readonly;
this.readonly = readonly; this.readonly = readonly;
@@ -83,20 +54,12 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
@Override @Override
public BaseControl setCaption(final String caption) { public BaseControl setCaption(final String caption) {
if (this.multiLine) {
this.modified |= caption != null && !caption.equals(this.caption);
}
if (caption != null) {
this.lastCaption = caption;
}
this.caption = caption; this.caption = caption;
return this; return this;
} }
public void setLastCaptionUpdateTime(final long lastCaptionUpdateTime) { public void setLastCaptionUpdateTime(final long lastCaptionUpdateTime) {
if (! this.multiLine) { this.modified |= this.lastCaptionUpdateTime != lastCaptionUpdateTime;
this.modified |= this.lastCaptionUpdateTime != lastCaptionUpdateTime;
}
this.lastCaptionUpdateTime = lastCaptionUpdateTime; this.lastCaptionUpdateTime = lastCaptionUpdateTime;
} }
@@ -104,61 +67,20 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
public void build() { public void build() {
super.build(); super.build();
if (this.multiLine) { this.textComponent = new CustomJTextField();
this.textComponent = new CustomJTextArea(); this.textComponent.setFocusable(true);
// this.scrollPane = new CustomJScrollPane(this.textComponent); this.textComponent.addActionListener(event -> {
this.rendererData.getEventService().fire(new UiControlEvent(this.id, (this.lastText == null ? "" : this.lastText) + "\n"));
this.textComponent.addMouseWheelListener(new MouseWheelListener() { this.caption = null;
this.lastText = "";
@Override this.textComponent.setText("");
public void mouseWheelMoved(final MouseWheelEvent e) { });
final var displayRows = G2DTextfieldControlImpl2.this.countMatches(G2DTextfieldControlImpl2.this.lastCaption, '\n');
if (displayRows == 0) {
return;
}
if (e.getWheelRotation() == -1) {
G2DTextfieldControlImpl2.this.scrollbar.setValue(Math.min(1.0, Math.max(0.0, G2DTextfieldControlImpl2.this.scrollbar.getValue() + (1.0 / (double) displayRows))));
}
else {
G2DTextfieldControlImpl2.this.scrollbar.setValue(Math.min(1.0, Math.max(0.0, G2DTextfieldControlImpl2.this.scrollbar.getValue() - (1.0 / (double) displayRows))));
}
G2DTextfieldControlImpl2.this.onScroll(G2DTextfieldControlImpl2.this.scrollbar.getValue());
}
});
}
else {
this.textComponent = new CustomJTextField();
((JTextField) this.textComponent).addActionListener(event -> {
// Simulate pressing enter and reset caption
this.rendererData.getEventService().fire(new UiControlEvent(this.id, (this.lastText == null ? "" : this.lastText) + "\n"));
this.caption = null;
this.lastCaption = "";
this.lastText = "";
this.textComponent.setText("");
});
}
this.textComponent.setName(this.id); this.textComponent.setName(this.id);
this.initControl(); this.initControl();
final var mainFrame = ((G2DRenderer) this.rendererData.getRenderer()).getMainFrame(); final var mainFrame = ((G2DRenderer) this.rendererData.getRenderer()).getMainFrame();
if (this.multiLine) { mainFrame.add(this.textComponent);
// mainFrame.add(this.scrollPane); this.updateAllComponentZOrder();
mainFrame.add(this.textComponent);
this.updateAllComponentZOrder();
this.scrollbar.setColor(RgbaColor.LIGHT_GRAY);
this.scrollbar.setHorizontal(false);
this.scrollbar.setValue(1.0);
this.scrollbar.setValue2(1.0);
this.scrollbar.build();
}
else {
mainFrame.add(this.textComponent);
this.updateAllComponentZOrder();
}
} }
@Override @Override
@@ -174,46 +96,21 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
this.rendererData.getEventService().fire(new UiControlEvent(this.id, this.lastText)); this.rendererData.getEventService().fire(new UiControlEvent(this.id, this.lastText));
} }
boolean componentDirty; final boolean componentDirty = this.textComponent.isDirty();
if (this.multiLine) { if (this.modified || componentDirty) {
componentDirty = ((CustomJTextArea) this.textComponent).isDirty();
}
else {
componentDirty = ((CustomJTextField) this.textComponent).isDirty();
}
if (this.modified || componentDirty || this.scrollPositionModified) {
this.rebuildBufferedImage(); this.rebuildBufferedImage();
this.bufferedImageGraphics.setClip(0, 0, this.bufferedImage.getWidth(), this.bufferedImage.getHeight()); this.bufferedImageGraphics.setClip(0, 0, this.bufferedImage.getWidth(), this.bufferedImage.getHeight());
if (this.multiLine) { this.textComponent.setDrawGraphics(this.bufferedImageGraphics);
((CustomJTextArea) this.textComponent).setDrawGraphics(this.bufferedImageGraphics);
// this.scrollPane.setDrawGraphics(this.bufferedImageGraphics);
}
else {
((CustomJTextField) this.textComponent).setDrawGraphics(this.bufferedImageGraphics);
}
this.initControl(); this.initControl();
if (this.multiLine) { this.textComponent.setDirty(false);
((CustomJTextArea) this.textComponent).setDirty(false);
}
else {
((CustomJTextField) this.textComponent).setDirty(false);
}
this.updateAllComponentZOrder(); this.updateAllComponentZOrder();
} }
else if (this.positionModified) { else if (this.positionModified) {
this.safeInvoke(() -> this.textComponent.setLocation(this.x, this.y)); this.safeInvoke(() -> this.textComponent.setLocation(this.x, this.y));
this.updateScrollBarArea();
this.positionModified = false; this.positionModified = false;
} }
if (this.multiLine) { this.safeInvoke(() -> this.textComponent.paint(this.bufferedImageGraphics));
// this.safeInvoke(() -> this.scrollPane.paint(this.bufferedImageGraphics));
this.safeInvoke(() -> this.textComponent.paint(this.bufferedImageGraphics));
this.scrollbar.render();
}
else {
this.safeInvoke(() -> this.textComponent.paint(this.bufferedImageGraphics));
}
super.render(); super.render();
} }
@@ -225,24 +122,12 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
} }
this.safeInvoke(() -> this.textComponent.setVisible(false)); this.safeInvoke(() -> this.textComponent.setVisible(false));
this.safeInvoke(() -> this.textComponent.invalidate()); this.safeInvoke(() -> this.textComponent.invalidate());
if (this.multiLine) { ((G2DRenderer) this.rendererData.getRenderer()).getMainFrame().remove(this.textComponent);
// this.safeInvoke(() -> this.scrollPane.invalidate());
// ((G2DRenderer) this.RendererData.getRenderer()).getMainFrame().remove(this.scrollPane);
((G2DRenderer) this.rendererData.getRenderer()).getMainFrame().remove(this.textComponent);
this.scrollbar.close();
}
else {
((G2DRenderer) this.rendererData.getRenderer()).getMainFrame().remove(this.textComponent);
}
super.close(); super.close();
} }
private void initControl() { private void initControl() {
if (this.multiLine && !this.readonly) {
throw new UnsupportedOperationException("Multiline property can only be set for readonly textfields");
}
final ThemeManager themeManager = (G2DThemeManager) this.rendererData.getThemeManager(); final ThemeManager themeManager = (G2DThemeManager) this.rendererData.getThemeManager();
final Color bgColor; final Color bgColor;
if (this.backgroundColor != null) { if (this.backgroundColor != null) {
@@ -254,71 +139,21 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
this.safeInvoke(() -> this.textComponent.setBackground(bgColor)); this.safeInvoke(() -> this.textComponent.setBackground(bgColor));
this.safeInvoke(() -> this.textComponent.setForeground(fgColor)); this.safeInvoke(() -> this.textComponent.setForeground(fgColor));
this.safeInvoke(() -> this.textComponent.setFont(G2DDrawFont.getFont(this.scaleFactor, this.fontSize))); this.safeInvoke(() -> this.textComponent.setFont(G2DDrawFont.getFont(this.scaleFactor, this.fontSize)));
if (this.multiLine) { this.safeInvoke(() -> this.textComponent.setLocation(this.x, this.y));
// this.safeInvoke(() -> this.scrollPane.setLocation(this.x, this.y)); this.safeInvoke(() -> this.textComponent.setSize(this.width, this.height));
// this.safeInvoke(() -> this.scrollPane.setSize(this.width, this.height)); this.safeInvoke(() -> this.textComponent.setEditable(this.enabled));
this.safeInvoke(() -> this.textComponent.setLocation(this.x, this.y));
this.positionModified = false;
this.safeInvoke(() -> this.textComponent.setSize(this.width - 30, this.height));
this.safeInvoke(() -> this.textComponent.setEditable(false));
// this.safeInvoke(() -> this.textComponent.setFocusable(false));
this.safeInvoke(() -> ((CustomJTextArea) this.textComponent).setLineWrap(true));
this.safeInvoke(() -> ((CustomJTextArea) this.textComponent).setWrapStyleWord(true));
this.updateScrollBarArea();
this.scrollbar.setEnabled(this.enabled);
this.scrollbar.setVisible(this.visible);
}
else {
this.safeInvoke(() -> this.textComponent.setLocation(this.x, this.y));
this.safeInvoke(() -> this.textComponent.setSize(this.width, this.height));
this.safeInvoke(() -> this.textComponent.setEditable(this.enabled));
}
this.safeInvoke(() -> this.textComponent.setVisible(this.visible)); this.safeInvoke(() -> this.textComponent.setVisible(this.visible));
this.safeInvoke(() -> this.textComponent.setEditable(!this.readonly)); this.safeInvoke(() -> this.textComponent.setEditable(!this.readonly));
try { try {
if (this.multiLine) { if (this.caption != null && !this.textComponent.getText().equals(this.caption) && (this.lastCaptionUpdateTimeInternal == 0L || this.lastCaptionUpdateTimeInternal < this.lastCaptionUpdateTime)) {
if (this.scrollPositionModified || this.caption != null) { final var pos = this.textComponent.getCaretPosition();
final var displayRows = this.countMatches(this.lastCaption, '\n'); this.safeInvoke(() -> this.textComponent.setText(this.caption));
final var skipRows = (int) ((double) this.scrollPositionPerc * (double) displayRows); if (pos < this.textComponent.getText().length()) {
var offset = 0; this.safeInvoke(() -> this.textComponent.setCaretPosition(pos));
for (var i = 0; i < skipRows; i++) {
offset = this.lastCaption.indexOf('\n', offset);
if (offset == -1) {
break;
}
offset++;
}
String displayText;
if (offset > -1) {
displayText = this.lastCaption.substring(offset);
}
else {
displayText = "";
}
if (!this.lastText.equals(displayText)) {
this.safeInvoke(() -> this.textComponent.setText(displayText));
// this.safeInvoke(() -> this.textComponent.setCaretPosition(this.textComponent.getDocument().getLength()));
this.lastText = displayText;
}
this.scrollPositionModified = false;
}
}
else {
if (this.caption != null && !this.textComponent.getText().equals(this.caption) && (this.lastCaptionUpdateTimeInternal == 0L || this.lastCaptionUpdateTimeInternal < this.lastCaptionUpdateTime)) {
final var pos = this.textComponent.getCaretPosition();
this.safeInvoke(() -> this.textComponent.setText(this.caption));
if (pos < this.textComponent.getText().length()) {
this.safeInvoke(() -> this.textComponent.setCaretPosition(pos));
}
this.lastText = this.caption;
this.lastCaptionUpdateTimeInternal = this.lastCaptionUpdateTime;
} }
this.lastText = this.caption;
this.lastCaptionUpdateTimeInternal = this.lastCaptionUpdateTime;
} }
} }
catch (final Exception exc) { catch (final Exception exc) {
@@ -326,33 +161,6 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
} }
} }
private void updateScrollBarArea() {
this.scrollbar.setX(this.x + this.width - 30);
this.scrollbar.setY(this.y);
this.scrollbar.setWidth(30);
this.scrollbar.setHeight(this.height);
this.scrollbar.setScaleFactor(this.scaleFactor);
}
private void onScroll(final double value) {
this.scrollPositionPerc = 1.0 - value;
this.scrollPositionModified = true;
this.scrollbar.setValue2(value);
}
private int countMatches(final String str, final char ch) {
if (str == null || str.isEmpty()) {
return 0;
}
var count = 0;
for (var i = 0; i < str.length(); i++) {
if (str.charAt(i) == ch) {
count++;
}
}
return count;
}
private void safeInvoke(final Runnable runnable) { private void safeInvoke(final Runnable runnable) {
try { try {
runnable.run(); runnable.run();
@@ -364,31 +172,26 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
@Override @Override
public G2DBaseControlImpl setScaleFactor(final double scaleFactor) { public G2DBaseControlImpl setScaleFactor(final double scaleFactor) {
this.scrollbar.setScaleFactor(scaleFactor);
return super.setScaleFactor(scaleFactor); return super.setScaleFactor(scaleFactor);
} }
@Override @Override
public BaseControl setControlGroup(final String controlGroup) { public BaseControl setControlGroup(final String controlGroup) {
this.scrollbar.setControlGroup(controlGroup);
return super.setControlGroup(controlGroup); return super.setControlGroup(controlGroup);
} }
@Override @Override
public BaseControl setRendererData(final RendererData RendererData) { public BaseControl setRendererData(final RendererData RendererData) {
this.scrollbar.setRendererData(RendererData);
return super.setRendererData(RendererData); return super.setRendererData(RendererData);
} }
@Override @Override
public G2DBaseControlImpl setMainFrameGraphics(final Graphics2D graphics) { public G2DBaseControlImpl setMainFrameGraphics(final Graphics2D graphics) {
this.scrollbar.setMainFrameGraphics(graphics);
return super.setMainFrameGraphics(graphics); return super.setMainFrameGraphics(graphics);
} }
@Override @Override
public BaseControl setControlId(final String id) { public BaseControl setControlId(final String id) {
this.scrollbar.setControlId(id + "_scroll");
return super.setControlId(id); return super.setControlId(id);
} }
} }