Skip to content
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

Jump to bottom

add split pane to weapon panel above to hit text #5270

Merged
merged 1 commit into from
Mar 23, 2024
Merged

add split pane to weapon panel above to hit text #5270

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
50 changes: 35 additions & 15 deletions megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,30 +372,48 @@ public void sort(Comparator<Mounted> comparator) {
WeaponPanel(UnitDisplay unitDisplay, Client client) {
this.unitDisplay = unitDisplay;
this.client = client;
panelMain = new JPanel();
panelMain.setOpaque(false);
panelMain.setLayout(new GridBagLayout());
panelMain.setAlignmentX(Component.LEFT_ALIGNMENT);
panelMain.setAlignmentY(Component.TOP_ALIGNMENT);
panelMain.setPreferredSize(new Dimension(INTERNAL_PANE_WIDTH, 20));
// having a max size set causes odd draw issues
panelMain.setMaximumSize(null);

JPanel panelTop = new JPanel();
panelTop.setOpaque(false);
panelTop.setLayout(new GridBagLayout());
gridy = 0;
createWeaponList(panelMain);
createWeaponDisplay(panelMain);
createRangeDisplay(panelMain);
createToHitDisplay(panelMain);
panelTop.setAlignmentX(Component.LEFT_ALIGNMENT);
panelTop.setAlignmentY(Component.TOP_ALIGNMENT);
panelTop.setPreferredSize(new Dimension(INTERNAL_PANE_WIDTH, 20));
// having a max size set causes odd draw issues
panelTop.setMaximumSize(null);
createWeaponList(panelTop);
createWeaponDisplay(panelTop);
createRangeDisplay(panelTop);
createToHitDisplay(panelTop);

JPanel panelText = new JPanel();
panelText.setOpaque(false);
panelText.setLayout(new GridBagLayout());
gridy = 0;
panelText.setAlignmentX(Component.LEFT_ALIGNMENT);
panelText.setAlignmentY(Component.TOP_ALIGNMENT);
panelText.setPreferredSize(new Dimension(INTERNAL_PANE_WIDTH, 20));
panelText.setMaximumSize(null);
createToHitText(panelText);

JSplitPane splitPaneMain = new JSplitPane( JSplitPane.VERTICAL_SPLIT, panelTop, panelText);
splitPaneMain.setOpaque(false);

panelMain = new JPanel();
panelMain.setOpaque(false);
panelMain.setLayout(new BoxLayout(panelMain, BoxLayout.Y_AXIS));
panelMain.add(splitPaneMain);

panelLower = new JPanel();
panelLower.setOpaque(false);
panelLower.setLayout(new GridBagLayout());
gridy = 0;
panelLower.setAlignmentX(Component.LEFT_ALIGNMENT);
panelLower.setAlignmentY(Component.TOP_ALIGNMENT);
panelLower.setPreferredSize(new Dimension(INTERNAL_PANE_WIDTH, 20));
panelLower.setMaximumSize(null);

gridy = 0;
createTargetDisplay(panelLower);

JSplitPane splitPane = new JSplitPane( JSplitPane.VERTICAL_SPLIT, panelMain, panelLower);
Expand Down Expand Up @@ -844,12 +862,14 @@ private void createToHitDisplay(JPanel parent) {
.anchor(GridBagConstraints.WEST)
.insets(5, 1, 5, 1).gridy(pgridy).gridx(3));

addSubdisplay(parent, pTargetInfo, LINE_HEIGHT * 2, GridBagConstraints.HORIZONTAL);
}

private void createToHitText(JPanel parent) {
toHitText = new JTextPane();
setupTextPane(toHitText);

JScrollPane toHitScroll = new JScrollPane(toHitText);

addSubdisplay(parent, pTargetInfo, LINE_HEIGHT*2, GridBagConstraints.HORIZONTAL);
addSubdisplay(parent, toHitScroll, LINE_HEIGHT * 3, GridBagConstraints.BOTH);
}

Expand Down
Loading