Skip to content

Commit

Permalink
Added GUI zoom button, made default zoom level 150% instead of 200%
Browse files Browse the repository at this point in the history 
Minor gui refactoring
  • Loading branch information
@Eirenliel
Eirenliel committed Jul 6, 2021
1 parent b790cfb commit 9482906
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 42 deletions.
42 changes: 42 additions & 0 deletions src/main/java/io/eiren/gui/ButtonTimer.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package io.eiren.gui;

import java.util.Timer;
import java.util.TimerTask;

import javax.swing.AbstractButton;

public class ButtonTimer {

private static Timer timer = new Timer();

public static void runTimer(AbstractButton button, int seconds, String defaultText, Runnable runnable) {
if(seconds <= 0) {
button.setText(defaultText);
runnable.run();
} else {
button.setText(String.valueOf(seconds));
timer.schedule(new ButtonTimerTask(button, seconds - 1, defaultText, runnable), 1000);
}
}

private static class ButtonTimerTask extends TimerTask {

private final AbstractButton button;
private final int seconds;
private final String defaultText;
private final Runnable runnable;

private ButtonTimerTask(AbstractButton button, int seconds, String defaultText, Runnable runnable) {
this.button = button;
this.seconds = seconds;
this.defaultText = defaultText;
this.runnable = runnable;
}

@Override
public void run() {
runTimer(button, seconds, defaultText, runnable);
}

}
}
108 changes: 66 additions & 42 deletions src/main/java/io/eiren/gui/VRServerGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
import io.eiren.vr.VRServer;
import io.eiren.vr.bridge.NamedPipeVRBridge;

import java.awt.Component;
import java.awt.Container;
import java.awt.Font;
import java.awt.event.MouseEvent;
import java.util.TimerTask;

import static javax.swing.BoxLayout.PAGE_AXIS;
import static javax.swing.BoxLayout.LINE_AXIS;
Expand All @@ -19,17 +21,23 @@ public class VRServerGUI extends JFrame {
public final VRServer server;
private final TrackersList trackersList;
private final SkeletonList skeletonList;
private java.util.Timer timer = new java.util.Timer();
private JButton resetButton;
private JScrollPane scroll;
private EJBox pane;

private float zoom = 1.5f;

@AWTThread
public VRServerGUI(VRServer server) {
super("SlimeVR Server");
increaseFontSize();
//increaseFontSize();

this.server = server;

this.zoom = server.config.getFloat("zoom", zoom);
setDefaultFontSize(zoom);
// All components should be constructed to the current zoom level by default

setDefaultCloseOperation(EXIT_ON_CLOSE);
getContentPane().setLayout(new BoxLayout(getContentPane(), PAGE_AXIS));

Expand All @@ -41,6 +49,10 @@ public VRServerGUI(VRServer server) {
build();
}

public float getZoom() {
return this.zoom;
}

public void refresh() {
// Pack and display
pack();
Expand Down Expand Up @@ -74,17 +86,26 @@ public void mouseClicked(MouseEvent e) {
}});
add(Box.createHorizontalGlue());
if(npvb != null) {
add(new JButton(npvb.isOneTrackerMode() ? "1" : "3") {{
add(new JButton(npvb.isOneTrackerMode() ? "Trackers: 1" : "Trackers: 3") {{
addMouseListener(new MouseInputAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
npvb.setSpawnOneTracker(!npvb.isOneTrackerMode());
setText(npvb.isOneTrackerMode() ? "1" : "3");
setText(npvb.isOneTrackerMode() ? "Trackers: 1" : "Trackers: 3");
}
});
}});
add(Box.createHorizontalStrut(10));
}
add(new JButton("GUI Zoom") {{
addMouseListener(new MouseInputAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
guiZoom();
}
});
}});
add(Box.createHorizontalStrut(10));
}});

pane.add(new EJBox(LINE_AXIS) {{
Expand All @@ -99,10 +120,10 @@ public void mouseClicked(MouseEvent e) {

add(new EJBox(PAGE_AXIS) {{
setAlignmentY(TOP_ALIGNMENT);
add(new JLabel("Skeleton"));
add(skeletonList);
add(new JLabel("Skeleton config"));
add(new JLabel("Body proportions"));
add(new SkeletonConfig(server, VRServerGUI.this));
add(new JLabel("Skeleton data"));
add(skeletonList);
add(Box.createVerticalGlue());
}});
}});
Expand All @@ -114,52 +135,55 @@ public void mouseClicked(MouseEvent e) {
server.addOnTick(skeletonList::updateBones);
}

private static void increaseFontSize() {
// For now only changes font size, but should change fixed components size in the future too
private void guiZoom() {
float zoomUpdate = zoom;
if(zoom <= 1.0f) {
zoom = 1.5f;
} else if(zoom <= 1.5f) {
zoom = 1.75f;
} else if(zoom <= 1.75f) {
zoom = 2.0f;
} else if(zoom <= 2.0f) {
zoom = 2.5f;
} else {
zoom = 1.0f;
}
zoomUpdate = zoom / zoomUpdate;
processNewZoom(zoomUpdate, pane);
refresh();
server.config.setProperty("zoom", zoom);
server.saveConfig();
}

private static void processNewZoom(float zoom, Component comp) {
if(comp.isFontSet()) {
Font font = comp.getFont();
Font newFont = font.deriveFont(font.getSize() * zoom);
comp.setFont(newFont);
}
if(comp instanceof Container) {
Container cont = (Container) comp;
for(Component child : cont.getComponents())
processNewZoom(zoom, child);
}
}

private static void setDefaultFontSize(float zoom) {
java.util.Enumeration<Object> keys = UIManager.getDefaults().keys();
while(keys.hasMoreElements()) {
Object key = keys.nextElement();
Object value = UIManager.get(key);
if(value instanceof javax.swing.plaf.FontUIResource) {
javax.swing.plaf.FontUIResource f = (javax.swing.plaf.FontUIResource) value;
javax.swing.plaf.FontUIResource f2 = new javax.swing.plaf.FontUIResource(f.deriveFont(f.getSize() * 2f));
javax.swing.plaf.FontUIResource f2 = new javax.swing.plaf.FontUIResource(f.deriveFont(f.getSize() * zoom));
UIManager.put(key, f2);
}
}
}

@AWTThread
private void reset() {
resetButton.setText("5");
timer.schedule(new TimerTask() {
@Override
public void run() {
resetButton.setText("4");
timer.schedule(new TimerTask() {
@Override
public void run() {
resetButton.setText("3");
timer.schedule(new TimerTask() {
@Override
public void run() {
resetButton.setText("2");
timer.schedule(new TimerTask() {
@Override
public void run() {
resetButton.setText("1");
timer.schedule(new TimerTask() {
@Override
public void run() {
server.resetTrackers();
resetButton.setText("RESET");
}
}, 1000);
}
}, 1000);
}
}, 1000);
}
}, 1000);
}
}, 1000);
ButtonTimer.runTimer(resetButton, 3, "RESET", server::resetTrackers);
}
}

0 comments on commit 9482906

Please sign in to comment.