ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3340 from deathbeam/fix-card-layout

Browse Source 
Properly set preferredSize of navContainer
This commit is contained in:
Tomas Slusny
2018-05-26 16:40:38 +02:00
committed by GitHub
parent d6f5259fc2 4234edef6c
commit 15d9cf2f8b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -383,7 +383,9 @@ public class ClientUI
navContainer = new JPanel(); navContainer = new JPanel();
navContainer.setLayout(cardLayout); navContainer.setLayout(cardLayout);
navContainer.setMinimumSize(new Dimension(0, 0)); navContainer.setMinimumSize(new Dimension(0, 0));
navContainer.setMaximumSize(new Dimension(0, Integer.MAX_VALUE)); navContainer.setMaximumSize(new Dimension(0, 0));
navContainer.setPreferredSize(new Dimension(0, 0));
// To reduce substance's colorization (tinting) // To reduce substance's colorization (tinting)
navContainer.putClientProperty(SubstanceSynapse.COLORIZATION_FACTOR, 1.0); navContainer.putClientProperty(SubstanceSynapse.COLORIZATION_FACTOR, 1.0);
container.add(navContainer); container.add(navContainer);
@@ -656,7 +658,6 @@ public class ClientUI
// Revalidate sizes of affected Swing components // Revalidate sizes of affected Swing components
container.revalidate(); container.revalidate();
container.repaint();
giveClientFocus(); giveClientFocus();
if (sidebarOpen) if (sidebarOpen)
@@ -688,18 +689,15 @@ public class ClientUI
toggleSidebar(); toggleSidebar();
} }
int expandBy = panel.getWrappedPanel().getPreferredSize().width; int width = panel.getWrappedPanel().getPreferredSize().width;
int expandBy = pluginPanel != null ? pluginPanel.getWrappedPanel().getPreferredSize().width - width : width;
if (pluginPanel != null)
{
expandBy = pluginPanel.getWrappedPanel().getPreferredSize().width - expandBy;
}
pluginPanel = panel; pluginPanel = panel;
navContainer.setMinimumSize(new Dimension(pluginPanel.getWrappedPanel().getPreferredSize().width, 0));
navContainer.setMaximumSize(new Dimension(pluginPanel.getWrappedPanel().getPreferredSize().width, Integer.MAX_VALUE));
final JPanel wrappedPanel = panel.getWrappedPanel(); // Expand sidebar
navContainer.setMinimumSize(new Dimension(width, 0));
navContainer.setMaximumSize(new Dimension(width, Integer.MAX_VALUE));
navContainer.setPreferredSize(new Dimension(width, 0));
navContainer.revalidate();
cardLayout.show(navContainer, button.getTooltip()); cardLayout.show(navContainer, button.getTooltip());
// panel.onActivate has to go after giveClientFocus so it can get focus if it needs. // panel.onActivate has to go after giveClientFocus so it can get focus if it needs.
@@ -727,6 +725,8 @@ public class ClientUI
pluginPanel.onDeactivate(); pluginPanel.onDeactivate();
navContainer.setMinimumSize(new Dimension(0, 0)); navContainer.setMinimumSize(new Dimension(0, 0));
navContainer.setMaximumSize(new Dimension(0, 0)); navContainer.setMaximumSize(new Dimension(0, 0));
navContainer.setPreferredSize(new Dimension(0, 0));
navContainer.revalidate();
giveClientFocus(); giveClientFocus();
frame.contractBy(pluginPanel.getWrappedPanel().getPreferredSize().width); frame.contractBy(pluginPanel.getWrappedPanel().getPreferredSize().width);
pluginPanel = null; pluginPanel = null;