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

Campaign Options Dialog: Fixing Scrolling Issues #3163

Merged
merged 1 commit into from
Mar 14, 2022
Merged

Campaign Options Dialog: Fixing Scrolling Issues #3163

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
66 changes: 32 additions & 34 deletions MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ public class CampaignOptionsPane extends AbstractMHQTabbedPane {
//endregion Skills Tab

//region Special Abilities Tab
private JPanel panSpecialAbilities;
private JScrollablePanel panSpecialAbilities;
private Hashtable<String, SpecialAbility> tempSPA;
private JButton btnAddSPA;
//endregion Special Abilities Tab
Expand Down Expand Up @@ -454,7 +454,7 @@ public class CampaignOptionsPane extends AbstractMHQTabbedPane {
//endregion RATs Tab

//region Against the Bot Tab
private JPanel panAtB;
private JScrollablePanel panAtB;
private JCheckBox chkUseAtB;
private JCheckBox chkUseStratCon;
private MMComboBox<String> comboSkillLevel;
Expand Down Expand Up @@ -566,11 +566,11 @@ protected void initialize() {
}

//region Legacy Initialization
private JPanel createGeneralTab() {
private JScrollPane createGeneralTab() {
int gridy = 0;
int gridx = 0;

JPanel panGeneral = new JPanel(new GridBagLayout());
JScrollablePanel panGeneral = new JScrollablePanel(new GridBagLayout());
panGeneral.setName("panGeneral");

JLabel lblName = new JLabel(resources.getString("lblName.text"));
Expand Down Expand Up @@ -684,11 +684,11 @@ private JPanel createGeneralTab() {
gridBagConstraints.anchor = GridBagConstraints.NORTHWEST;
panGeneral.add(btnIcon, gridBagConstraints);

return panGeneral;
return new JScrollPane(panGeneral);
}

private JPanel createRepairAndMaintenanceTab() {
final JPanel panRepair = new JPanel();
private JScrollPane createRepairAndMaintenanceTab() {
final JScrollablePanel panRepair = new JScrollablePanel();
panRepair.setName("panRepair");
panRepair.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -918,11 +918,11 @@ private JPanel createRepairAndMaintenanceTab() {
gridBagConstraints.weighty = 1.0;
panSubMaintenance.add(logMaintenance, gridBagConstraints);

return panRepair;
return new JScrollPane(panRepair);
}

private JPanel createSuppliesAndAcquisitionsTab() {
final JPanel panSupplies = new JPanel();
private JScrollPane createSuppliesAndAcquisitionsTab() {
final JScrollablePanel panSupplies = new JScrollablePanel();
panSupplies.setName("panSupplies");
panSupplies.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -1273,13 +1273,13 @@ private JPanel createSuppliesAndAcquisitionsTab() {
gridBagConstraints.anchor = GridBagConstraints.NORTHWEST;
panSubPlanetAcquire.add(panSocioIndustrialBonus, gridBagConstraints);

return panSupplies;
return new JScrollPane(panSupplies);
}

private JPanel createTechLimitsTab() {
private JScrollPane createTechLimitsTab() {
int gridy = 0;

final JPanel panTech = new JPanel();
final JScrollablePanel panTech = new JScrollablePanel();
panTech.setName("panTech");
panTech.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -1406,13 +1406,13 @@ private JPanel createTechLimitsTab() {
gridBagConstraints.anchor = GridBagConstraints.NORTHWEST;
panTech.add(useAmmoByTypeBox, gridBagConstraints);

return panTech;
return new JScrollPane(panTech);
}

private JPanel createFinancesTab() {
private JScrollPane createFinancesTab() {
int gridy = 0;

JPanel panFinances = new JPanel();
JScrollablePanel panFinances = new JScrollablePanel();
panFinances.setName("panFinances");
panFinances.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -1620,11 +1620,11 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
gridBagConstraints.gridheight = 20;
panFinances.add(createPriceModifiersPanel(), gridBagConstraints);

return panFinances;
return new JScrollPane(panFinances);
}

private JPanel createMercenaryTab() {
final JPanel panMercenary = new JPanel();
private JScrollPane createMercenaryTab() {
final JScrollablePanel panMercenary = new JScrollablePanel();
panMercenary.setName("panMercenary");
panMercenary.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -1741,11 +1741,11 @@ private JPanel createMercenaryTab() {
groupContract.add(btnContractEquipment);
groupContract.add(btnContractPersonnel);

return panMercenary;
return new JScrollPane(panMercenary);
}

private JPanel createExperienceTab() {
final JPanel panXP = new JPanel();
private JScrollPane createExperienceTab() {
final JScrollablePanel panXP = new JScrollablePanel();
panXP.setName("panXP");
panXP.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -2043,11 +2043,11 @@ private JPanel createExperienceTab() {
gridBagConstraints.insets = new Insets(5, 5, 5, 5);
panXP.add(scrXP, gridBagConstraints);

return panXP;
return new JScrollPane(panXP);
}

private JScrollPane createSkillsTab() {
final JPanel panSkill = new JScrollablePanel();
final JScrollablePanel panSkill = new JScrollablePanel();
panSkill.setName("panSkill");
panSkill.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -2127,9 +2127,8 @@ private JScrollPane createSkillsTab() {
gridBagConstraints.gridy++;
}

JScrollPane scrSkill = new JScrollPane(panSkill);
final JScrollPane scrSkill = new JScrollPane(panSkill);
scrSkill.setPreferredSize(new Dimension(500, 400));

return scrSkill;
}

Expand Down Expand Up @@ -2157,7 +2156,7 @@ private JScrollPane createSpecialAbilitiesTab() {
private JScrollPane createSkillRandomizationTab() {
GridBagConstraints gridBagConstraints;

final JPanel panRandomSkill = new JPanel();
final JScrollablePanel panRandomSkill = new JScrollablePanel();
panRandomSkill.setName("panRandomSkill");
panRandomSkill.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -2424,10 +2423,10 @@ private JScrollPane createSkillRandomizationTab() {
return scrRandomSkill;
}

private JPanel createNameAndPortraitGenerationTab() {
private JScrollPane createNameAndPortraitGenerationTab() {
int gridy = 0;

final JPanel panNameGen = new JPanel();
final JScrollablePanel panNameGen = new JScrollablePanel();
panNameGen.setName("panNameGen");
panNameGen.setLayout(new GridBagLayout());

Expand Down Expand Up @@ -2563,7 +2562,7 @@ private JPanel createNameAndPortraitGenerationTab() {
gridBagConstraints.anchor = GridBagConstraints.WEST;
panNameGen.add(chkAssignPortraitOnRoleChange, gridBagConstraints);

return panNameGen;
return new JScrollPane(panNameGen);
}

private JScrollPane createAgainstTheBotTab() {
Expand Down Expand Up @@ -3022,15 +3021,14 @@ private JScrollPane createAgainstTheBotTab() {

JScrollPane scrAtB = new JScrollPane(panAtB);
scrAtB.setPreferredSize(new Dimension(500, 410));

return scrAtB;
}
//endregion Legacy Initialization

//region Modern Initialization
//region Personnel Tab
private JScrollPane createPersonnelTab() {
final JPanel personnelPanel = new JScrollablePanel(new GridBagLayout());
final JScrollablePanel personnelPanel = new JScrollablePanel(new GridBagLayout());
personnelPanel.setName("personnelPanel");

final GridBagConstraints gbc = new GridBagConstraints();
Expand Down Expand Up @@ -5030,7 +5028,7 @@ private JScrollPane createRankSystemsTab() {

//region Markets Tab
private JScrollPane createMarketsTab() {
final JPanel marketsPanel = new JPanel(new GridBagLayout());
final JScrollablePanel marketsPanel = new JScrollablePanel(new GridBagLayout());
marketsPanel.setName("marketsPanel");

GridBagConstraints gbc = new GridBagConstraints();
Expand Down Expand Up @@ -5366,7 +5364,7 @@ private JScrollPane createRATTab() {
final ButtonGroup group = new ButtonGroup();

// Create the Panel
final JPanel panel = new JPanel(new GridBagLayout());
final JScrollablePanel panel = new JScrollablePanel(new GridBagLayout());
panel.setName("ratPanel");

// Create Panel Components
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/gui/panes/RankSystemsPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected void initialize() {
? new RankSystem(getCampaign().getRankSystem()) : getCampaign().getRankSystem());

// Then, we can start creating the actual panel
final JPanel rankSystemsPanel = new JScrollablePanel(new GridBagLayout());
final JScrollablePanel rankSystemsPanel = new JScrollablePanel(new GridBagLayout());
rankSystemsPanel.setName("rankSystemsPanel");

final GridBagConstraints gbc = new GridBagConstraints();
Expand Down