angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 06:57:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

DesktopPane: avoid using two instances of DefaultDesktopManager if a custom desktop manager is used/wrapped (see PR #294)

Browse Source
This commit is contained in:
Karl Tauber
2021-04-09 18:17:15 +02:00
parent 6db39d1860
commit ab1ce7fab1
4 changed files with 132 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInternalFrameTest.java
View File

@@ -107,6 +107,12 @@ public class FlatInternalFrameTest
frameCount++;
}
private void customDesktopManagerChanged() {
desktopPane.setDesktopManager( customDesktopManagerCheckBox.isSelected()
? new CustomDesktopManager()
: null );
}
private void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
desktopPane = new JDesktopPane();
@@ -120,6 +126,8 @@ public class FlatInternalFrameTest
titleLabel = new JLabel();
titleField = new JTextField();
createFrameButton = new JButton();
panel1 = new JPanel();
customDesktopManagerCheckBox = new JCheckBox();
//======== this ========
setLayout(new MigLayout(
@@ -127,7 +135,8 @@ public class FlatInternalFrameTest
// columns
"[grow,fill]",
// rows
"[grow,fill]"));
"[grow,fill]" +
"[]"));
//======== desktopPane ========
{
@@ -194,6 +203,22 @@ public class FlatInternalFrameTest
palette.setBounds(15, 25, 275, 185);
}
add(desktopPane, "cell 0 0,width 600,height 600");
//======== panel1 ========
{
panel1.setLayout(new MigLayout(
"insets 0,hidemode 3",
// columns
"[fill]",
// rows
"[]"));
//---- customDesktopManagerCheckBox ----
customDesktopManagerCheckBox.setText("custom desktop manager");
customDesktopManagerCheckBox.addActionListener(e -> customDesktopManagerChanged());
panel1.add(customDesktopManagerCheckBox, "cell 0 0");
}
add(panel1, "cell 0 1");
// JFormDesigner - End of component initialization //GEN-END:initComponents
if( UIScale.getUserScaleFactor() > 1 )
@@ -212,5 +237,37 @@ public class FlatInternalFrameTest
private JLabel titleLabel;
private JTextField titleField;
private JButton createFrameButton;
private JPanel panel1;
private JCheckBox customDesktopManagerCheckBox;
// JFormDesigner - End of variables declaration //GEN-END:variables
//---- class CustomDesktopManager -----------------------------------------
private static class CustomDesktopManager
extends DefaultDesktopManager
{
@Override
public void activateFrame( JInternalFrame f ) {
System.out.println( "activateFrame: " + f.getTitle() );
super.activateFrame( f );
}
@Override
public void deactivateFrame( JInternalFrame f ) {
System.out.println( "deactivateFrame: " + f.getTitle() );
super.deactivateFrame( f );
}
@Override
public void iconifyFrame( JInternalFrame f ) {
System.out.println( "iconifyFrame: " + f.getTitle() );
super.iconifyFrame( f );
}
@Override
public void deiconifyFrame( JInternalFrame f ) {
System.out.println( "deiconifyFrame: " + f.getTitle() );
super.deiconifyFrame( f );
}
}
}

20
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInternalFrameTest.jfd
View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
new FormModel {
contentType: "form/swing"
@@ -6,7 +6,7 @@ new FormModel {
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "insets dialog,hidemode 3"
"$columnConstraints": "[grow,fill]"
"$rowConstraints": "[grow,fill]"
"$rowConstraints": "[grow,fill][]"
} ) {
name: "this"
add( new FormContainer( "javax.swing.JDesktopPane", new FormLayoutManager( class javax.swing.JDesktopPane ) ) {
@@ -90,6 +90,22 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 0,width 600,height 600"
} )
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "insets 0,hidemode 3"
"$columnConstraints": "[fill]"
"$rowConstraints": "[]"
} ) {
name: "panel1"
add( new FormComponent( "javax.swing.JCheckBox" ) {
name: "customDesktopManagerCheckBox"
"text": "custom desktop manager"
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "customDesktopManagerChanged", false ) )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 0"
} )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 1"
} )
}, new FormLayoutConstraints( null ) {
"location": new java.awt.Point( 0, 0 )
"size": new java.awt.Dimension( 500, 515 )