From ab1ad818c082815516383df049e67cd4ab82d328 Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Sat, 18 Jul 2020 14:43:47 +0200 Subject: Make GridBagConstraintsBuilder.insets respect scale --- .../cuchaz/enigma/gui/dialog/AbstractDialog.java | 2 +- .../java/cuchaz/enigma/gui/dialog/StatsDialog.java | 2 +- .../java/cuchaz/enigma/gui/panels/EditorPanel.java | 4 ++-- .../cuchaz/enigma/gui/panels/IdentifierPanel.java | 2 +- .../enigma/gui/util/GridBagConstraintsBuilder.java | 24 ++++++++++++++++++---- 5 files changed, 25 insertions(+), 9 deletions(-) (limited to 'enigma-swing/src/main/java') diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java index 57f7f948..c9ca8090 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java @@ -33,7 +33,7 @@ public abstract class AbstractDialog extends JDialog { JLabel label = new JLabel(I18n.translate(entry.a)); Component component = entry.b; - GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(4); + GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(2); inputContainer.add(label, cb.pos(0, i).weightX(0.0).anchor(GridBagConstraints.LINE_END).fill(GridBagConstraints.NONE).build()); inputContainer.add(component, cb.pos(1, i).weightX(1.0).anchor(GridBagConstraints.LINE_END).fill(GridBagConstraints.HORIZONTAL).build()); diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java index 1e81a169..0bd2f18c 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java @@ -36,7 +36,7 @@ public class StatsDialog { Container contentPane = dialog.getContentPane(); contentPane.setLayout(new GridBagLayout()); - GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(4); + GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(2); Map checkboxes = new HashMap<>(); diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java index e4a120b3..9bf5fa72 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java @@ -365,7 +365,7 @@ public class EditorPanel { this.decompilingProgressBar.setIndeterminate(true); this.ui.setLayout(new GridBagLayout()); - GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(ScaleUtil.scale(2)); + GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(2); this.ui.add(this.decompilingLabel, cb.pos(0, 0).anchor(GridBagConstraints.SOUTH).build()); this.ui.add(this.decompilingProgressBar, cb.pos(0, 1).anchor(GridBagConstraints.NORTH).build()); break; @@ -377,7 +377,7 @@ public class EditorPanel { } case ERRORED: { this.ui.setLayout(new GridBagLayout()); - GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(ScaleUtil.scale(2)).weight(1.0, 0.0).anchor(GridBagConstraints.WEST); + GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(2).weight(1.0, 0.0).anchor(GridBagConstraints.WEST); this.ui.add(this.errorLabel, cb.pos(0, 0).build()); this.ui.add(new JSeparator(JSeparator.HORIZONTAL), cb.pos(0, 1).fill(GridBagConstraints.HORIZONTAL).build()); this.ui.add(this.errorScrollPane, cb.pos(0, 2).weight(1.0, 1.0).fill(GridBagConstraints.BOTH).build()); diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java index 7704242f..248d50d0 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java @@ -188,7 +188,7 @@ public class IdentifierPanel { public void addRow(Component c1, Component c2) { GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create() - .insets(ScaleUtil.scale(2)) + .insets(2) .anchor(GridBagConstraints.WEST); c.add(c1, cb.pos(0, this.row).build()); c.add(c2, cb.pos(1, this.row).weightX(1.0).fill(GridBagConstraints.HORIZONTAL).build()); diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GridBagConstraintsBuilder.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GridBagConstraintsBuilder.java index 9c12eaff..65b0f337 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GridBagConstraintsBuilder.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GridBagConstraintsBuilder.java @@ -2,7 +2,7 @@ package cuchaz.enigma.gui.util; import java.awt.GridBagConstraints; -public class GridBagConstraintsBuilder { +public final class GridBagConstraintsBuilder { private final GridBagConstraints inner; @@ -76,18 +76,34 @@ public class GridBagConstraintsBuilder { } public GridBagConstraintsBuilder insets(int all) { - return this.insets(all, all, all, all); + return this.insetsUnscaled(ScaleUtil.scale(all)); } public GridBagConstraintsBuilder insets(int vertical, int horizontal) { - return this.insets(vertical, horizontal, vertical, horizontal); + return this.insetsUnscaled(ScaleUtil.scale(vertical), ScaleUtil.scale(horizontal)); } public GridBagConstraintsBuilder insets(int top, int horizontal, int bottom) { - return this.insets(top, horizontal, bottom, horizontal); + return this.insetsUnscaled(ScaleUtil.scale(top), ScaleUtil.scale(horizontal), ScaleUtil.scale(bottom)); } public GridBagConstraintsBuilder insets(int top, int right, int bottom, int left) { + return this.insetsUnscaled(ScaleUtil.scale(top), ScaleUtil.scale(right), ScaleUtil.scale(bottom), ScaleUtil.scale(left)); + } + + public GridBagConstraintsBuilder insetsUnscaled(int all) { + return this.insetsUnscaled(all, all, all, all); + } + + public GridBagConstraintsBuilder insetsUnscaled(int vertical, int horizontal) { + return this.insetsUnscaled(vertical, horizontal, vertical, horizontal); + } + + public GridBagConstraintsBuilder insetsUnscaled(int top, int horizontal, int bottom) { + return this.insetsUnscaled(top, horizontal, bottom, horizontal); + } + + public GridBagConstraintsBuilder insetsUnscaled(int top, int right, int bottom, int left) { GridBagConstraintsBuilder copy = this.copy(); copy.inner.insets.set(top, left, bottom, right); return copy; -- cgit v1.2.3