Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent ProfileSelectWindow from growing beyond height of screen 

This is based on 3a51759e8a
master
Treer 2016-01-30 22:17:32 +11:00
parent 471d1d7245
commit 7ca1e774b5
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/amidst/gui/profileselect/ProfileComponent.java
View File

@ -30,8 +30,8 @@ public abstract class ProfileComponent {
@CalledOnlyBy(AmidstThread.EDT)
public Component() {
this.setMinimumSize(new Dimension(300, 40));
this.setPreferredSize(new Dimension(500, 40));
this.setMinimumSize(ProfileComponent.getDefaultMinimumSize());
this.setPreferredSize(ProfileComponent.getDefaultPreferredSize());
}
@CalledOnlyBy(AmidstThread.EDT)
@ -141,6 +141,14 @@ public abstract class ProfileComponent {
protected void initComponent() {
this.component = new Component();
}
public static Dimension getDefaultPreferredSize() {
return new Dimension(500, 40);
}
public static Dimension getDefaultMinimumSize() {
return new Dimension(300, 40);
}
@CalledOnlyBy(AmidstThread.EDT)
public boolean isSelected() {

24
src/main/java/amidst/gui/profileselect/ProfileSelectWindow.java
View File

@ -9,6 +9,7 @@ import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import net.miginfocom.swing.MigLayout;
import amidst.AmidstMetaData;
@ -56,8 +57,27 @@ public class ProfileSelectWindow {
frame.setIconImages(metadata.getIcons());
frame.getContentPane().setLayout(new MigLayout());
frame.add(createTitleLabel(), "h 20!,w :400:, growx, pushx, wrap");
frame.add(new JScrollPane(profileSelectPanel.getComponent()),
"grow, push, h 80::");
// The preferred width should be at least a scrollbar-width wider than
// the ProfileComponent's preferredSize width of 500 (so 520?).
// The preferred height should allow the dialog to fit easily on a 720p
// display, while being nicely divisible by ProfileComponent's height
// of 40 (so 520 again then?).
// +1 is added to preferredWidth because if I don't then preferredWidth
// is one pixel too small and a horizontal scrollbar is created
int preferredWidth =
ProfileComponent.getDefaultPreferredSize().width +
(Integer)UIManager.get("ScrollBar.width");
int preferredHeight = ProfileComponent.getDefaultPreferredSize().height * 13;
JScrollPane scrollPane = new JScrollPane(profileSelectPanel.getComponent());
scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
frame.add(
scrollPane,
"grow, push, w :" + preferredWidth + ":, h 80:" + preferredHeight + ":"
);
frame.pack();
frame.addKeyListener(profileSelectPanel.createKeyListener());
frame.addWindowListener(new WindowAdapter() {