Skip to content

Allow fonts in address/code columns to be changed #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhijieshi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow fonts in address/code columns to be changed #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/rars/venus/DataSegmentWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,10 @@ private JScrollPane generateDataPanel() {
dataTable.getTableHeader().setReorderingAllowed(false);
dataTable.setRowSelectionAllowed(false);
// Addresses are column 0, render right-justified in mono font
MonoRightCellRenderer monoRightCellRenderer = new MonoRightCellRenderer();
AddressCellRenderer addressCellRenderer = new AddressCellRenderer();
dataTable.getColumnModel().getColumn(ADDRESS_COLUMN).setPreferredWidth(60);
dataTable.getColumnModel().getColumn(ADDRESS_COLUMN).setCellRenderer(monoRightCellRenderer);
dataTable.getColumnModel().getColumn(ADDRESS_COLUMN).setCellRenderer(addressCellRenderer);
// Data cells are columns 1 onward, render right-justitifed in mono font but highlightable.
AddressCellRenderer addressCellRenderer = new AddressCellRenderer();
for (int i = 1; i < NUMBER_OF_COLUMNS; i++) {
dataTable.getColumnModel().getColumn(i).setPreferredWidth(60);
dataTable.getColumnModel().getColumn(i).setCellRenderer(addressCellRenderer);
Expand Down
17 changes: 10 additions & 7 deletions src/rars/venus/TextSegmentWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.awt.event.MouseListener;
import java.util.*;

/*
/*
Copyright (c) 2003-2007, Pete Sanderson and Kenneth Vollmar

Developed by Pete Sanderson (psanderson@otterbein.edu)
Expand Down Expand Up @@ -68,7 +68,7 @@ public class TextSegmentWindow extends JInternalFrame implements Observer {
private Hashtable<Integer, ModifiedCode> executeMods; // key is table model row, value is original code, basic, source.
private Container contentPane;
private TextTableModel tableModel;
private Font tableCellFont = new Font("Monospaced", Font.PLAIN, 12);
// private Font tableCellFont = new Font("Monospaced", Font.PLAIN, 12);
private boolean codeHighlighting;
private boolean breakpointsEnabled; // Added 31 Dec 2009
private int highlightAddress;
Expand All @@ -81,7 +81,7 @@ public class TextSegmentWindow extends JInternalFrame implements Observer {
private static final int BASIC_COLUMN = 3;
private static final int SOURCE_COLUMN = 4;

private static final Font monospacedPlain12Point = new Font("Monospaced", Font.PLAIN, 12);
// private static final Font monospacedPlain12Point = new Font("Monospaced", Font.PLAIN, 12);
// The following is displayed in the Basic and Source columns if existing code is overwritten using self-modifying code feature
private static final String modifiedCodeMarker = " ------ ";

Expand Down Expand Up @@ -173,8 +173,9 @@ public void setupTable() {
table.getColumnModel().getColumn(BASIC_COLUMN).setCellRenderer(codeStepHighlighter);
table.getColumnModel().getColumn(SOURCE_COLUMN).setCellRenderer(codeStepHighlighter);
// to render String right-justified in mono font
table.getColumnModel().getColumn(ADDRESS_COLUMN).setCellRenderer(new MonoRightCellRenderer());
table.getColumnModel().getColumn(CODE_COLUMN).setCellRenderer(new MachineCodeCellRenderer());
MachineCodeCellRenderer machineCodeCellRenderer = new MachineCodeCellRenderer();
table.getColumnModel().getColumn(ADDRESS_COLUMN).setCellRenderer(machineCodeCellRenderer);
table.getColumnModel().getColumn(CODE_COLUMN).setCellRenderer(machineCodeCellRenderer);
table.getColumnModel().getColumn(BREAK_COLUMN).setCellRenderer(new CheckBoxTableCellRenderer());
reorderColumns(); // Re-order columns according to current preference...
// Add listener to catch column re-ordering for updating settings.
Expand Down Expand Up @@ -613,7 +614,7 @@ private void deleteAsTextSegmentObserver() {

/*
* Re-order the Text segment columns according to saved preferences.
*/
*/

private void reorderColumns() {
TableColumnModel oldtcm = table.getColumnModel();
Expand Down Expand Up @@ -844,14 +845,16 @@ public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
JLabel cell = (JLabel) super.getTableCellRendererComponent(table, value,
isSelected, hasFocus, row, column);
cell.setFont(MonoRightCellRenderer.MONOSPACED_PLAIN_12POINT);
// cell.setFont(MonoRightCellRenderer.MONOSPACED_PLAIN_12POINT);
cell.setHorizontalAlignment(SwingConstants.RIGHT);
if (row % 2 == 0) {
cell.setBackground(Globals.getSettings().getColorSettingByPosition(Settings.EVEN_ROW_BACKGROUND));
cell.setForeground(Globals.getSettings().getColorSettingByPosition(Settings.EVEN_ROW_FOREGROUND));
cell.setFont(Globals.getSettings().getFontByPosition(Settings.EVEN_ROW_FONT));
} else {
cell.setBackground(Globals.getSettings().getColorSettingByPosition(Settings.ODD_ROW_BACKGROUND));
cell.setForeground(Globals.getSettings().getColorSettingByPosition(Settings.ODD_ROW_FOREGROUND));
cell.setFont(Globals.getSettings().getFontByPosition(Settings.ODD_ROW_FONT));
}
return cell;
}
Expand Down