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

refactor(renderer): improve mouse event handling in ScrollArea and CustomWindowPanel

Browse Source
This commit is contained in:
extio-de
2026-01-26 21:41:50 +01:00
parent eae2e30684
commit 16208971aa
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/extio/game_engine/renderer/container/ScrollArea.java
View File

@@ -83,6 +83,10 @@ public class ScrollArea implements WindowComponent {
protected void onMouseWheelEvent(final MouseClickEvent event) {
if (event.getButton() == 4 || event.getButton() == 5) {
if (Window.getContainerUnderCursor(event) != this.parent) {
return;
}
if (!SpatialUtils2.intersects(
this.relativeArea.getPosition().add(this.parent.getAbsolutePosition()),
this.relativeArea.getDimension(),

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

@@ -213,7 +213,7 @@ public class Window extends AbstractClientModule implements InitializingBean {
}
protected void onMouseClickEvent(final MouseClickEvent event) {
final Window containerUnderCursor = this.getContainerUnderCursor(event);
final Window containerUnderCursor = getContainerUnderCursor(event);
if (containerUnderCursor == this) {
if (event.isPressed() && !this.dragging) {
this.zIndexToTop();
@@ -355,7 +355,7 @@ public class Window extends AbstractClientModule implements InitializingBean {
return this.normalizedArea.getDimension().toImmutableCoordI2();
}
private Window getContainerUnderCursor(final MouseEvent event) {
public static Window getContainerUnderCursor(final MouseEvent event) {
Window containerUnderCursor = null;
synchronized (DISPLAYED_CONTAINERS) {
short zIndexHighest = -1;

1
src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowPanel.java
View File

@@ -92,6 +92,7 @@ public class CustomWindowPanel extends Component {
public void mouseWheelMoved(final MouseWheelEvent e) {
if (CustomWindowPanel.this.getParent() instanceof final G2DMainFrame mainFrame) {
mainFrame.handleWheelMoved(e, ImmutableCoordI2.create(CustomWindowPanel.this.getX(), CustomWindowPanel.this.getY()));
e.consume();
}
}
});