Skip to content

Fix window pos #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
supersaiyansubtlety wants to merge 4 commits into
base: develop/2.8
Choose a base branch
from
Open

Fix window pos #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d919178
fix crash when Vec2i configs lacked components
supersaiyansubtlety Nov 8, 2025
5357b92
clamp window pos on open
supersaiyansubtlety Nov 8, 2025
089639f
improve window pos clamping and add comments
supersaiyansubtlety Nov 8, 2025
5f02c23
use getWidth() instead of getSize().width
supersaiyansubtlety Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.quiltmc.enigma.gui.util.ScaleUtil;
import org.quiltmc.enigma.network.ServerMessage;
import org.quiltmc.enigma.util.I18n;
import org.quiltmc.enigma.util.Utils;
import org.quiltmc.enigma.util.validation.Message;
import org.quiltmc.enigma.util.validation.ParameterizedMessage;
import org.quiltmc.enigma.util.validation.ValidationContext;
Expand All @@ -63,6 +64,7 @@
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Toolkit;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -77,6 +79,8 @@
import java.util.stream.Stream;

public class Gui {
private static final int DEFAULT_MIN_TOP_ON_SCREEN = 200;

private final MainWindow mainWindow;
private final GuiController controller;

Expand Down Expand Up @@ -230,7 +234,21 @@ private void setupUi() {
frame.setMinimumSize(ScaleUtil.getDimension(640, 480));
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);

Point windowPos = Config.main().windowPos.value().toPoint();
final Point windowPos = Config.main().windowPos.value().toPoint();
final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

// keep the whole width (or as much as will fit) on-screen so window controls in the title bar are accessible
final int clampedX = Utils.clamp(windowPos.x, 0, Math.max(0, screenSize.width - frame.getWidth()));
// allow some of the bottom to be off-screen, but not the top, because of the title bar
final int clampedY = Utils.clamp(windowPos.y, 0, screenSize.height - ScaleUtil.scale(DEFAULT_MIN_TOP_ON_SCREEN));

if (windowPos.x != clampedX || windowPos.y != clampedY) {
windowPos.x = clampedX;
windowPos.y = clampedY;

Config.main().windowPos.setValue(Config.Vec2i.fromPoint(windowPos));
}

frame.setLocation(windowPos);

this.retranslateUi();
Expand Down
7 changes: 6 additions & 1 deletion enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.awt.Point;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Objects;

/**
* Enigma config is separated into several {@value #FORMAT} files with names matching the methods used to access them:
Expand Down Expand Up @@ -237,7 +238,11 @@ public static Vec2i fromPoint(Point point) {

@Override
public Vec2i convertFrom(ValueMap<Integer> representation) {
return new Vec2i(representation.get("x"), representation.get("y"));
final int defaultValue = Objects.requireNonNullElse(representation.getDefaultValue(), 0);
return new Vec2i(
representation.getOrDefault("x", defaultValue),
representation.getOrDefault("y", defaultValue)
);
}

@Override
Expand Down