Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changing Font Size On Hex Viewer

Browse source
This commit is contained in:
Konloch 2021-07-21 04:20:15 -07:00
parent 4e57bd03e4
commit 612f89cd1c
5 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
View file

@ -794,6 +794,11 @@ public class MainViewerGUI extends JFrame
deleteForeignOutdatedLibs.setSelected(Configuration.deleteForeignLibraries); deleteForeignOutdatedLibs.setSelected(Configuration.deleteForeignLibraries);
} }
public int getFontSize()
{
return (int) fontSpinner.getValue();
}
public synchronized void clearBusyStatus() public synchronized void clearBusyStatus()
{ {
SwingUtilities.invokeLater(()-> SwingUtilities.invokeLater(()->

8
src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/JHexEditor.java
View file

@ -1,5 +1,7 @@
package the.bytecode.club.bytecodeviewer.gui.hexviewer; package the.bytecode.club.bytecodeviewer.gui.hexviewer;
import the.bytecode.club.bytecodeviewer.BytecodeViewer;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@ -28,7 +30,7 @@ public class JHexEditor extends JPanel implements FocusListener, AdjustmentListe
byte[] buff; byte[] buff;
public int cursor; public int cursor;
protected static Font font = new Font("Monospaced", Font.PLAIN, 12); public Font font;
protected int border = 2; protected int border = 2;
public boolean DEBUG = false; public boolean DEBUG = false;
private final JScrollBar sb; private final JScrollBar sb;
@ -40,7 +42,10 @@ public class JHexEditor extends JPanel implements FocusListener, AdjustmentListe
public JHexEditor(byte[] buff) public JHexEditor(byte[] buff)
{ {
super(); super();
this.buff = buff; this.buff = buff;
this.font = new Font("Monospaced", Font.PLAIN, BytecodeViewer.viewer.getFontSize());
checkSize(); checkSize();
this.addMouseWheelListener(this); this.addMouseWheelListener(this);
@ -85,6 +90,7 @@ public class JHexEditor extends JPanel implements FocusListener, AdjustmentListe
checkSize(); checkSize();
FontMetrics fn = getFontMetrics(font); FontMetrics fn = getFontMetrics(font);
Rectangle rec = this.getBounds(); Rectangle rec = this.getBounds();
lineas = (rec.height / fn.getHeight()) - 1; lineas = (rec.height / fn.getHeight()) - 1;
int n = (buff.length / textLength) - 1; int n = (buff.length / textLength) - 1;

6
src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/JHexEditorASCII.java
View file

@ -38,7 +38,7 @@ public class JHexEditorASCII extends JComponent implements MouseListener, KeyLis
debug("getMinimumSize()"); debug("getMinimumSize()");
Dimension d = new Dimension(); Dimension d = new Dimension();
FontMetrics fn = getFontMetrics(JHexEditor.font); FontMetrics fn = getFontMetrics(he.font);
int w = fn.stringWidth(" "); int w = fn.stringWidth(" ");
int h = fn.getHeight(); int h = fn.getHeight();
int nl = he.getLineas(); int nl = he.getLineas();
@ -69,7 +69,7 @@ public class JHexEditorASCII extends JComponent implements MouseListener, KeyLis
g.fillRect(0, 0, d.width, d.height); g.fillRect(0, 0, d.width, d.height);
g.setColor(Color.black); g.setColor(Color.black);
g.setFont(JHexEditor.font); g.setFont(he.font);
// datos ascii // datos ascii
int ini = he.getInicio() * he.textLength; int ini = he.getInicio() * he.textLength;
@ -113,7 +113,7 @@ public class JHexEditorASCII extends JComponent implements MouseListener, KeyLis
// calcular la posicion del raton // calcular la posicion del raton
public int calcularPosicionRaton(int x, int y) { public int calcularPosicionRaton(int x, int y) {
FontMetrics fn = getFontMetrics(JHexEditor.font); FontMetrics fn = getFontMetrics(he.font);
x = x / (fn.stringWidth(" ") + 1); x = x / (fn.stringWidth(" ") + 1);
y = y / fn.getHeight(); y = y / fn.getHeight();
debug("x=" + x + " ,y=" + y); debug("x=" + x + " ,y=" + y);

4
src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/JHexEditorHEX.java
View file

@ -54,7 +54,7 @@ public class JHexEditorHEX extends JComponent implements MouseListener, KeyListe
g.setColor(Color.white); g.setColor(Color.white);
} }
g.setFont(JHexEditor.font); g.setFont(he.font);
int ini = he.getInicio() * he.textLength; int ini = he.getInicio() * he.textLength;
int fin = ini + (he.getLineas() * he.textLength); int fin = ini + (he.getLineas() * he.textLength);
@ -102,7 +102,7 @@ public class JHexEditorHEX extends JComponent implements MouseListener, KeyListe
// calcular la posicion del raton // calcular la posicion del raton
public int calcularPosicionRaton(int x, int y) { public int calcularPosicionRaton(int x, int y) {
FontMetrics fn = getFontMetrics(JHexEditor.font); FontMetrics fn = getFontMetrics(he.font);
x = x / ((fn.stringWidth(" ") + 1) * 3); x = x / ((fn.stringWidth(" ") + 1) * 3);
y = y / fn.getHeight(); y = y / fn.getHeight();
debug("x=" + x + " ,y=" + y); debug("x=" + x + " ,y=" + y);

4
src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
View file

@ -96,7 +96,7 @@ public class BytecodeViewPanelUpdater implements Runnable
SwingUtilities.invokeLater(() -> SwingUtilities.invokeLater(() ->
{ {
final JHexEditor hex = new JHexEditor(cw.toByteArray()); final JHexEditor hex = new JHexEditor(cw.toByteArray());
hex.setFont(new Font(Font.MONOSPACED, Font.PLAIN, (int) BytecodeViewer.viewer.fontSpinner.getValue())); hex.setFont(new Font(Font.MONOSPACED, Font.PLAIN, BytecodeViewer.viewer.getFontSize()));
bytecodeViewPanel.add(hex); bytecodeViewPanel.add(hex);
}); });
@ -374,6 +374,6 @@ public class BytecodeViewPanelUpdater implements Runnable
String editable = isPanelEditable ? " - " + EDITABLE : ""; String editable = isPanelEditable ? " - " + EDITABLE : "";
bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable); bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable);
bytecodeViewPanel.textArea.setFont(new Font(Font.MONOSPACED, Font.PLAIN, (int) BytecodeViewer.viewer.fontSpinner.getValue())); bytecodeViewPanel.textArea.setFont(new Font(Font.MONOSPACED, Font.PLAIN, BytecodeViewer.viewer.getFontSize()));
} }
} }