Fix newer JDKs
This commit is contained in:
parent
0653e8583e
commit
a291fec941
1 changed files with 18 additions and 23 deletions
|
@ -152,7 +152,7 @@ public class BetterJOptionPane
|
||||||
JOptionPane pane = new JOptionPane("");
|
JOptionPane pane = new JOptionPane("");
|
||||||
pane.add(panel, 0);
|
pane.add(panel, 0);
|
||||||
|
|
||||||
JDialog dialog = createNewJDialogue(parentComponent, pane, panel.getName(), 0, (d)->
|
JDialog dialog = createNewJDialogue(parentComponent, pane, panel.getName(), ERROR_MESSAGE, (d)->
|
||||||
{
|
{
|
||||||
int newHeight = Math.min(minimumHeight, d.getHeight());
|
int newHeight = Math.min(minimumHeight, d.getHeight());
|
||||||
d.setMinimumSize(new Dimension(d.getWidth(), newHeight));
|
d.setMinimumSize(new Dimension(d.getWidth(), newHeight));
|
||||||
|
@ -165,15 +165,15 @@ public class BetterJOptionPane
|
||||||
|
|
||||||
private static JDialog createNewJDialogue(Component parentComponent, JOptionPane pane, String title, int style, OnCreate onCreate)
|
private static JDialog createNewJDialogue(Component parentComponent, JOptionPane pane, String title, int style, OnCreate onCreate)
|
||||||
{
|
{
|
||||||
JDialog dialog = null;
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
||||||
|
if (JDialog.isDefaultLookAndFeelDecorated()) {
|
||||||
//reflection to cheat our way around the
|
boolean supportsWindowDecorations =
|
||||||
// private createDialog(Component parentComponent, String title, int style)
|
UIManager.getLookAndFeel().getSupportsWindowDecorations();
|
||||||
try
|
if (supportsWindowDecorations) {
|
||||||
{
|
dialog.setUndecorated(true);
|
||||||
Method createDialog = pane.getClass().getDeclaredMethod("createDialog", Component.class, String.class, int.class);
|
pane.getRootPane().setWindowDecorationStyle(style);
|
||||||
createDialog.setAccessible(true);
|
}
|
||||||
dialog = (JDialog) createDialog.invoke(pane, parentComponent, title, style);
|
}
|
||||||
|
|
||||||
//check if the dialogue is in a poor location, attempt to correct
|
//check if the dialogue is in a poor location, attempt to correct
|
||||||
if (dialog.getLocation().getY() == 0 || dialog.getLocation().getY() == 1)
|
if (dialog.getLocation().getY() == 0 || dialog.getLocation().getY() == 1)
|
||||||
|
@ -182,11 +182,6 @@ public class BetterJOptionPane
|
||||||
dialog.setLocationRelativeTo(BytecodeViewer.viewer);
|
dialog.setLocationRelativeTo(BytecodeViewer.viewer);
|
||||||
|
|
||||||
onCreate.onCreate(dialog);
|
onCreate.onCreate(dialog);
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
dialog.show();
|
dialog.show();
|
||||||
dialog.dispose();
|
dialog.dispose();
|
||||||
|
|
Loading…
Reference in a new issue