From 04b01512c124c76f3b3d99ba07ef30ea6a90b52f Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Fri, 24 Apr 2020 18:39:57 +0200 Subject: Add a configurable scale factor (#230) * Add swing-dpi dependency * Implement scale factor * Improve custom scale dialog, fix crash * Remove use of $ in identifiers * Use custom functional interface for scale listeners * Bump version Co-authored-by: modmuss50 --- src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java | 3 ++- src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java | 3 ++- src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java | 3 ++- src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java | 5 +++-- src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/dialog') diff --git a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java index 82fd6a5..43b8265 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java @@ -13,6 +13,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; import cuchaz.enigma.utils.I18n; +import cuchaz.enigma.gui.util.ScaleUtil; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -59,7 +60,7 @@ public class AboutDialog { // show the frame pane.doLayout(); - frame.setSize(400, 220); + frame.setSize(ScaleUtil.getDimension(400, 220)); frame.setResizable(false); frame.setLocationRelativeTo(parent); frame.setVisible(true); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java index 78b1d75..908b42e 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java @@ -13,6 +13,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; import cuchaz.enigma.utils.I18n; +import cuchaz.enigma.gui.util.ScaleUtil; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -81,7 +82,7 @@ public class CrashDialog { pane.add(buttonsPanel, BorderLayout.SOUTH); // show the frame - frame.setSize(600, 400); + frame.setSize(ScaleUtil.getDimension(600, 400)); frame.setLocationRelativeTo(parent); frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } diff --git a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java index 033318a..b2c159d 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java @@ -12,6 +12,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.utils.I18n; +import cuchaz.enigma.gui.util.ScaleUtil; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -72,7 +73,7 @@ public class JavadocDialog { pane.add(buttonsPanel, BorderLayout.SOUTH); // show the frame - frame.setSize(600, 400); + frame.setSize(ScaleUtil.getDimension(600, 400)); frame.setLocationRelativeTo(parent); frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java index 6d9a419..e33ae82 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java @@ -14,6 +14,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; import cuchaz.enigma.ProgressListener; import cuchaz.enigma.utils.I18n; +import cuchaz.enigma.gui.util.ScaleUtil; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -48,11 +49,11 @@ public class ProgressDialog implements ProgressListener, AutoCloseable { this.labelText.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); panel.add(this.labelText, BorderLayout.NORTH); panel.add(this.progress, BorderLayout.CENTER); - panel.setPreferredSize(new Dimension(360, 50)); + panel.setPreferredSize(ScaleUtil.getDimension(360, 50)); // show the frame pane.doLayout(); - this.frame.setSize(400, 120); + this.frame.setSize(ScaleUtil.getDimension(400, 120)); this.frame.setResizable(false); this.frame.setLocationRelativeTo(parent); this.frame.setVisible(true); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java index 47f9149..56ce751 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java @@ -15,6 +15,7 @@ import com.google.common.collect.Lists; import cuchaz.enigma.gui.Gui; import cuchaz.enigma.translation.representation.entry.ClassEntry; import cuchaz.enigma.utils.I18n; +import cuchaz.enigma.gui.util.ScaleUtil; import me.xdrop.fuzzywuzzy.FuzzySearch; import me.xdrop.fuzzywuzzy.model.ExtractedResult; @@ -107,7 +108,7 @@ public class SearchDialog { frame.setContentPane(pane); frame.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS)); - frame.setSize(360, 500); + frame.setSize(ScaleUtil.getDimension(360, 500)); frame.setAlwaysOnTop(true); frame.setResizable(false); frame.setLocationRelativeTo(parent.getFrame()); -- cgit v1.2.3