Skip to content

Make components in MainView resizable #35

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
Lenart12 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make components in MainView resizable #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29e3152
Make components in `MainView` resizable
Lenart12 Nov 7, 2022
8e30555
Fit `DisassemblyView` to current height.
Lenart12 Nov 7, 2022
d0e3cdb
Merge remote-tracking branch 'origin/master' into resizing
Lenart12 Nov 9, 2022
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
12 changes: 6 additions & 6 deletions src/sic/sim/MainView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ public MainView(final Executor executor, Disassembler disassembler, Args arg) {
westPanel.add(cpuView.mainPanel, BorderLayout.NORTH);
westPanel.add(disassemblyView.mainPanel, BorderLayout.CENTER);

JPanel eastPanel = new JPanel(new BorderLayout());
eastPanel.add(watchView.mainPanel, BorderLayout.NORTH);
eastPanel.add(memoryView.mainPanel, BorderLayout.CENTER);
JSplitPane eastPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
eastPanel.setTopComponent(watchView.mainPanel);
eastPanel.setBottomComponent(memoryView.mainPanel);

JPanel mainPanel = new JPanel(new BorderLayout());
mainPanel.add(westPanel, BorderLayout.WEST);
mainPanel.add(eastPanel, BorderLayout.CENTER);
JSplitPane mainPanel = new JSplitPane();
mainPanel.setLeftComponent(westPanel);
mainPanel.setRightComponent(eastPanel);

mainFrame = new JFrame("SicTools");
mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
Expand Down
24 changes: 22 additions & 2 deletions src/sic/sim/views/DisassemblyView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public Component getTableCellRendererComponent(JTable table, Object value,
public class DisassemblyView {

public static final int MOVE_SMALL = 1;
private static final int ROW_AMOUNT = 19;

private Executor executor;
private Machine machine;
Expand Down Expand Up @@ -96,7 +95,7 @@ public DisassemblyView(final Executor executor, final Disassembler disassembler)
$$$setupUI$$$();
// disassembly table
modelDis = (DefaultTableModel) tabDis.getModel();
modelDis.setRowCount(DisassemblyView.ROW_AMOUNT);
fitRowCountToCurrentHeight();
modelDis.setColumnCount(7);
tabDis.setBackground(Colors.bg);
tabDis.setForeground(Colors.fg);
Expand Down Expand Up @@ -160,6 +159,20 @@ public void mouseClicked(MouseEvent evt) {
super.mouseClicked(evt);
}
});
tabDis.addComponentListener(new ComponentListener() {
@Override
public void componentResized(ComponentEvent evt) {
fitRowCountToCurrentHeight();
updateDis(false, false);
}

@Override
public void componentMoved(ComponentEvent e) {}
@Override
public void componentShown(ComponentEvent e) {}
@Override
public void componentHidden(ComponentEvent e) {}
});
tabDis.addMouseWheelListener(new MouseAdapter() {
@Override
public void mouseWheelMoved(MouseWheelEvent evt){
Expand Down Expand Up @@ -217,6 +230,13 @@ public boolean isCellEditable(int row, int column) {
};
}

private void fitRowCountToCurrentHeight() {
final var inset = tabDis.getInsets();
final var totalHeight = tabDis.getHeight() - inset.top - inset.bottom;
final int rowCount = totalHeight / tabDis.getRowHeight();
modelDis.setRowCount(rowCount);
}

private void updateBreakpoint(int row, boolean active) {
modelDis.setValueAt(active ? "1" : "", row, 0);
}
Expand Down