Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2025-01-26 17:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Add display scaling to SubServers.Console

Browse Source
This commit is contained in:
ME1312 2019-07-02 00:11:10 -04:00
parent 0e19122d9c
commit c6d611836c
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
8 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SubServers.Bungee/pom.xml
View File

@ -30,13 +30,14 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -44,12 +45,14 @@
<artifactId>Server</artifactId> <artifactId>Server</artifactId>
<version>19w26a</version> <version>19w26a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dosse.upnp</groupId> <groupId>com.dosse.upnp</groupId>
<artifactId>WaifUPnP</artifactId> <artifactId>WaifUPnP</artifactId>
<version>1.1</version> <version>1.1</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.imaginarycode.minecraft</groupId> <groupId>com.imaginarycode.minecraft</groupId>

4
SubServers.Client/Bukkit/pom.xml
View File

@ -48,14 +48,16 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>19w26a</version> <version>19w26a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.puharesource.mc</groupId> <groupId>io.puharesource.mc</groupId>

4
SubServers.Client/Sponge/pom.xml
View File

@ -30,14 +30,16 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>19w26a</version> <version>19w26a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>

4
SubServers.Console/pom.xml
View File

@ -21,14 +21,14 @@
<groupId>org.fusesource.jansi</groupId> <groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId> <artifactId>jansi</artifactId>
<version>1.17.1</version> <version>1.17.1</version>
<scope>compile</scope> <scope>provided</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.intellij</groupId> <groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId> <artifactId>forms_rt</artifactId>
<version>7.0.3</version> <version>7.0.3</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.md_5</groupId> <groupId>net.md_5</groupId>

3
SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.form
View File

@ -115,6 +115,7 @@
<background color="-12236470"/> <background color="-12236470"/>
<contentAreaFilled value="false"/> <contentAreaFilled value="false"/>
<focusPainted value="false"/> <focusPainted value="false"/>
<font size="12"/>
<foreground color="-1"/> <foreground color="-1"/>
<opaque value="true"/> <opaque value="true"/>
<text value=" Next "/> <text value=" Next "/>
@ -128,6 +129,7 @@
<background color="-12236470"/> <background color="-12236470"/>
<contentAreaFilled value="false"/> <contentAreaFilled value="false"/>
<focusPainted value="false"/> <focusPainted value="false"/>
<font size="12"/>
<foreground color="-1"/> <foreground color="-1"/>
<opaque value="true"/> <opaque value="true"/>
<text value=" Previous "/> <text value=" Previous "/>
@ -141,6 +143,7 @@
<background color="-12236470"/> <background color="-12236470"/>
<contentAreaFilled value="false"/> <contentAreaFilled value="false"/>
<focusPainted value="false"/> <focusPainted value="false"/>
<font size="12"/>
<foreground color="-1"/> <foreground color="-1"/>
<opaque value="true"/> <opaque value="true"/>
<text value=" Done "/> <text value=" Done "/>

66
SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java
View File

@ -31,6 +31,7 @@ public final class ConsoleWindow implements SubLogFilter {
private static final String RESET_VALUE = "\n\u00A0\n\u00A0"; private static final String RESET_VALUE = "\n\u00A0\n\u00A0";
private ConsolePlugin plugin; private ConsolePlugin plugin;
private JFrame window; private JFrame window;
private double scale = 1.0;
private JPanel panel; private JPanel panel;
private JTextField input; private JTextField input;
private boolean ifocus = false; private boolean ifocus = false;
@ -50,7 +51,7 @@ public final class ConsoleWindow implements SubLogFilter {
private boolean running = true; private boolean running = true;
private LinkedList<Object> messages = new LinkedList<Object>(); private LinkedList<Object> messages = new LinkedList<Object>();
private SubLogger logger; private SubLogger logger;
private int fontSize = 12; private int fontSize;
private File file = null; private File file = null;
private FileOutputStream filewriter = null; private FileOutputStream filewriter = null;
private List<Runnable> spost = new LinkedList<Runnable>(); private List<Runnable> spost = new LinkedList<Runnable>();
@ -130,6 +131,24 @@ public final class ConsoleWindow implements SubLogFilter {
findO = 0; findO = 0;
} }
break; break;
case KeyEvent.VK_F:
if (kpressed[KeyEvent.VK_SHIFT] == Boolean.TRUE) {
boolean open = false;
if (ifocus) {
findT.setText(input.getSelectedText());
open = true;
} else if (log.hasFocus()) {
findT.setText(log.getSelectedText());
open = true;
}
if (open) {
findI = 0;
findO = 0;
ConsoleWindow.this.find.setVisible(true);
ConsoleWindow.this.find(true);
}
}
break;
case KeyEvent.VK_ENTER: case KeyEvent.VK_ENTER:
if (find.isVisible() && !ifocus) if (find.isVisible() && !ifocus)
ConsoleWindow.this.find(kpressed[KeyEvent.VK_SHIFT] != Boolean.TRUE); ConsoleWindow.this.find(kpressed[KeyEvent.VK_SHIFT] != Boolean.TRUE);
@ -157,6 +176,14 @@ public final class ConsoleWindow implements SubLogFilter {
} }
window = new JFrame(); window = new JFrame();
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
if (Float.parseFloat(System.getProperty("java.class.version")) < 53.0) { // Automatic scaling for Java 8
if (screen.getWidth() < screen.getHeight()) {
if (screen.getWidth() > 1920) scale = screen.getWidth() / 1920;
} else {
if (screen.getHeight() > 1080) scale = screen.getHeight() / 1080;
}
}
JMenuBar jMenu = new JMenuBar(); JMenuBar jMenu = new JMenuBar();
JMenu menu = new JMenu("\u00A0Log\u00A0"); JMenu menu = new JMenu("\u00A0Log\u00A0");
@ -298,7 +325,7 @@ public final class ConsoleWindow implements SubLogFilter {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
HTMLDocument doc = (HTMLDocument) log.getDocument(); HTMLDocument doc = (HTMLDocument) log.getDocument();
fontSize = 12; fontSize = (int) (12 * scale);
doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n"); doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n");
ConsoleWindow.this.hScroll(); ConsoleWindow.this.hScroll();
} }
@ -310,7 +337,7 @@ public final class ConsoleWindow implements SubLogFilter {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
HTMLDocument doc = (HTMLDocument) log.getDocument(); HTMLDocument doc = (HTMLDocument) log.getDocument();
fontSize += 2; fontSize += 2 * scale;
doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n"); doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n");
ConsoleWindow.this.hScroll(); ConsoleWindow.this.hScroll();
} }
@ -322,7 +349,7 @@ public final class ConsoleWindow implements SubLogFilter {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
HTMLDocument doc = (HTMLDocument) log.getDocument(); HTMLDocument doc = (HTMLDocument) log.getDocument();
fontSize -= 2; fontSize -= 2 * scale;
doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n"); doc.getStyleSheet().addRule("body {font-size: " + fontSize + ";}\n");
ConsoleWindow.this.hScroll(); ConsoleWindow.this.hScroll();
} }
@ -341,10 +368,11 @@ public final class ConsoleWindow implements SubLogFilter {
}); });
window.setTitle(logger.getName() + " \u2014 SubServers 2"); window.setTitle(logger.getName() + " \u2014 SubServers 2");
window.setSize(1024, 576); window.setSize(1024, 576);
Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize(); window.setSize((int) (1024 * scale), (int) (576 * scale));
int x = (int) ((dimension.getWidth() - window.getWidth()) / 2); window.setLocation(
int y = (int) ((dimension.getHeight() - window.getHeight()) / 2); (int) ((screen.getWidth() - window.getWidth()) / 2),
window.setLocation(x, y); (int) ((screen.getHeight() - window.getHeight()) / 2)
);
window.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); window.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
window.addWindowListener(new WindowAdapter() { window.addWindowListener(new WindowAdapter() {
@Override @Override
@ -363,16 +391,17 @@ public final class ConsoleWindow implements SubLogFilter {
log.setContentType("text/html"); log.setContentType("text/html");
log.setEditorKit(new HTMLEditorKit()); log.setEditorKit(new HTMLEditorKit());
StyleSheet style = new StyleSheet(); StyleSheet style = new StyleSheet();
fontSize = (int) (12 * scale);
String font; String font;
try { try {
Font f = Font.createFont(Font.TRUETYPE_FONT, ConsoleWindow.class.getResourceAsStream("/net/ME1312/SubServers/Console/ConsoleFont.ttf")); Font f = Font.createFont(Font.TRUETYPE_FONT, ConsoleWindow.class.getResourceAsStream("/net/ME1312/SubServers/Console/ConsoleFont.ttf"));
GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(f); GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(f);
font = f.getFontName(); font = f.getFontName();
input.setFont(f.deriveFont(14f)); input.setFont(f.deriveFont((float) (14 * scale)));
} catch (Exception e) { } catch (Exception e) {
font = "Courier"; font = "Courier";
} }
style.addRule("body {color: #dcdcdc; font-family: " + font + "; font-size: 12;}\n"); style.addRule("body {color: #dcdcdc; font-family: " + font + "; font-size: " + fontSize + ";}\n");
log.setDocument(new HTMLDocument(style)); log.setDocument(new HTMLDocument(style));
log.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45))); log.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45)));
new TextFieldPopup(log, false); new TextFieldPopup(log, false);
@ -398,7 +427,9 @@ public final class ConsoleWindow implements SubLogFilter {
popup = new TextFieldPopup(input, true); popup = new TextFieldPopup(input, true);
input.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45), 4)); input.setFont(input.getFont().deriveFont((float) (14 * scale)));
input.getPreferredSize().setSize(input.getPreferredSize().getWidth(), input.getPreferredSize().getHeight() * scale);
input.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45), (int) (4 * scale)));
input.addActionListener(new ActionListener() { input.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
@ -487,7 +518,9 @@ public final class ConsoleWindow implements SubLogFilter {
}); });
new TextFieldPopup(findT, false); new TextFieldPopup(findT, false);
findT.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45), 4)); findT.setFont(findT.getFont().deriveFont((float) (findT.getFont().getSize() * scale)));
findT.getPreferredSize().setSize(findT.getPreferredSize().getWidth(), findT.getPreferredSize().getHeight() * scale);
findT.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45), (int) (4 * scale)));
((AbstractDocument) findT.getDocument()).setDocumentFilter(new DocumentFilter() { ((AbstractDocument) findT.getDocument()).setDocumentFilter(new DocumentFilter() {
@Override @Override
public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr) throws BadLocationException { public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr) throws BadLocationException {
@ -510,6 +543,7 @@ public final class ConsoleWindow implements SubLogFilter {
findO = 0; findO = 0;
} }
}); });
findP.setFont(findP.getFont().deriveFont((float) (findP.getFont().getSize() * scale)));
findP.addChangeListener(new ChangeListener() { findP.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -517,7 +551,8 @@ public final class ConsoleWindow implements SubLogFilter {
else findP.setBackground(new Color(69, 73, 74)); else findP.setBackground(new Color(69, 73, 74));
} }
}); });
findP.setBorder(new ButtonBorder(40, 44, 45, 4)); findP.setBorder(new ButtonBorder(40, 44, 45, (int) (4 * scale)));
findN.setFont(findN.getFont().deriveFont((float) (findN.getFont().getSize() * scale)));
findP.addActionListener(new ActionListener() { findP.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
@ -531,13 +566,14 @@ public final class ConsoleWindow implements SubLogFilter {
else findN.setBackground(new Color(69, 73, 74)); else findN.setBackground(new Color(69, 73, 74));
} }
}); });
findN.setBorder(new ButtonBorder(40, 44, 45, 4)); findN.setBorder(new ButtonBorder(40, 44, 45, (int) (4 * scale)));
findN.addActionListener(new ActionListener() { findN.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
ConsoleWindow.this.find(true); ConsoleWindow.this.find(true);
} }
}); });
findD.setFont(findD.getFont().deriveFont((float) (findD.getFont().getSize() * scale)));
findD.addChangeListener(new ChangeListener() { findD.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -545,7 +581,7 @@ public final class ConsoleWindow implements SubLogFilter {
else findD.setBackground(new Color(69, 73, 74)); else findD.setBackground(new Color(69, 73, 74));
} }
}); });
findD.setBorder(new ButtonBorder(40, 44, 45, 4)); findD.setBorder(new ButtonBorder(40, 44, 45, (int) (4 * scale)));
findD.addActionListener(new ActionListener() { findD.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {

5
SubServers.Host/pom.xml
View File

@ -20,20 +20,23 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>19w26a</version> <version>19w26a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dosse.upnp</groupId> <groupId>com.dosse.upnp</groupId>
<artifactId>WaifUPnP</artifactId> <artifactId>WaifUPnP</artifactId>
<version>1.1</version> <version>1.1</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>

7
SubServers.Sync/pom.xml
View File

@ -30,13 +30,14 @@
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUtil</artifactId> <artifactId>GalaxiUtil</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ME1312.Galaxi</groupId> <groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId> <artifactId>GalaxiEngine</artifactId>
<version>19w26a</version> <version>19w27b</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -44,12 +45,14 @@
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>19w26a</version> <version>19w26a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dosse.upnp</groupId> <groupId>com.dosse.upnp</groupId>
<artifactId>WaifUPnP</artifactId> <artifactId>WaifUPnP</artifactId>
<version>1.1</version> <version>1.1</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.imaginarycode.minecraft</groupId> <groupId>com.imaginarycode.minecraft</groupId>