Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix newer JDKs

Browse source
This commit is contained in:
Nico Mexis 2021-07-21 12:26:32 +02:00
parent 0653e8583e
commit a291fec941
No known key found for this signature in database
GPG key ID: 27D6E17CE092AB78
1 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/the/bytecode/club/bytecodeviewer/gui/components/BetterJOptionPane.java
View file

@ -151,8 +151,8 @@ public class BetterJOptionPane
//create a new option pane with a empty text and just 'ok' //create a new option pane with a empty text and just 'ok'
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,28 +165,23 @@ 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
if(dialog.getLocation().getY() == 0 || dialog.getLocation().getY() == 1)
dialog.setLocationRelativeTo(null); //TODO check if BytecodeViewer.viewer is better on multi monitor for this edgecase
else
dialog.setLocationRelativeTo(BytecodeViewer.viewer);
onCreate.onCreate(dialog);
}
catch(Exception e)
{
e.printStackTrace();
} }
//check if the dialogue is in a poor location, attempt to correct
if (dialog.getLocation().getY() == 0 || dialog.getLocation().getY() == 1)
dialog.setLocationRelativeTo(null); //TODO check if BytecodeViewer.viewer is better on multi monitor for this edgecase
else
dialog.setLocationRelativeTo(BytecodeViewer.viewer);
onCreate.onCreate(dialog);
dialog.show(); dialog.show();
dialog.dispose(); dialog.dispose();