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

Better Hex Editor in Dark Mode

Browse source
This commit is contained in:
Nico Mexis 2021-07-21 23:20:42 +02:00
parent 06d07959bb
commit fa85fd7479
No known key found for this signature in database
GPG key ID: 27D6E17CE092AB78
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import java.awt.Graphics;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.*; import java.awt.event.*;
import javax.swing.*; import javax.swing.*;
import the.bytecode.club.bytecodeviewer.Configuration;
/** /**
* @author laullon * @author laullon
@ -235,9 +236,9 @@ public class JHexEditor extends JPanel implements FocusListener, AdjustmentListe
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
Dimension d = getMinimumSize(); Dimension d = getMinimumSize();
g.setColor(Color.white); g.setColor(Configuration.lafTheme.isDark() ? Color.darkGray : Color.white);
g.fillRect(0, 0, d.width, d.height); g.fillRect(0, 0, d.width, d.height);
g.setColor(Color.black); g.setColor(Configuration.lafTheme.isDark() ? Color.white : Color.black);
g.setFont(font); g.setFont(font);
for (int n = 0; n < textLength; n++) { for (int n = 0; n < textLength; n++) {
@ -297,9 +298,9 @@ public class JHexEditor extends JPanel implements FocusListener, AdjustmentListe
public void paint(Graphics g) public void paint(Graphics g)
{ {
Dimension d = getMinimumSize(); Dimension d = getMinimumSize();
g.setColor(Color.white); g.setColor(Configuration.lafTheme.isDark() ? Color.darkGray : Color.white);
g.fillRect(0, 0, d.width, d.height); g.fillRect(0, 0, d.width, d.height);
g.setColor(Color.black); g.setColor(Configuration.lafTheme.isDark() ? Color.white : Color.black);
g.setFont(font); g.setFont(font);
int ini = getInicio(); int ini = getInicio();

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

@ -9,6 +9,7 @@ import java.awt.event.KeyListener;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import javax.swing.JComponent; import javax.swing.JComponent;
import the.bytecode.club.bytecodeviewer.Configuration;
/** /**
* @author laullon * @author laullon
@ -65,9 +66,9 @@ public class JHexEditorASCII extends JComponent implements MouseListener, KeyLis
debug("paint(" + g + ")"); debug("paint(" + g + ")");
debug("cursor=" + he.cursor + " buff.length=" + he.buff.length); debug("cursor=" + he.cursor + " buff.length=" + he.buff.length);
Dimension d = getMinimumSize(); Dimension d = getMinimumSize();
g.setColor(Color.white); g.setColor(Configuration.lafTheme.isDark() ? Color.darkGray : Color.white);
g.fillRect(0, 0, d.width, d.height); g.fillRect(0, 0, d.width, d.height);
g.setColor(Color.black); g.setColor(Configuration.lafTheme.isDark() ? Color.white : Color.black);
g.setFont(he.font); g.setFont(he.font);
@ -87,11 +88,11 @@ public class JHexEditorASCII extends JComponent implements MouseListener, KeyLis
else else
he.cuadro(g, x, y, 1); he.cuadro(g, x, y, 1);
if (hasFocus()) if (hasFocus())
g.setColor(Color.white); g.setColor(Configuration.lafTheme.isDark() ? Color.black : Color.white);
else else
g.setColor(Color.black); g.setColor(Configuration.lafTheme.isDark() ? Color.white : Color.black);
} else { } else {
g.setColor(Color.black); g.setColor(Configuration.lafTheme.isDark() ? Color.white : Color.black);
} }
String s = String.valueOf((char) (he.buff[n] & 0xFF));//"" + new Character((char) he.buff[n]); String s = String.valueOf((char) (he.buff[n] & 0xFF));//"" + new Character((char) he.buff[n]);