Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 22:40:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Theme Editor: fixed tabbed pane "more tabs" popup in preview

Browse Source
This commit is contained in:
Karl Tauber
2021-08-21 18:24:57 +02:00
parent dab0ee3306
commit cca4ab3cd8
2 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.java
View File

@@ -18,7 +18,9 @@
package com.formdev.flatlaf.themeeditor;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.HierarchyEvent;
import java.util.function.Function;
import javax.swing.*;
import javax.swing.UIDefaults.ActiveValue;
import javax.swing.UIDefaults.LazyValue;
@@ -26,6 +28,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.extras.components.*;
import com.formdev.flatlaf.ui.FlatTabbedPaneUI;
import net.miginfocom.swing.*;
/**
@@ -43,6 +46,7 @@ class FlatThemePreview
initComponents();
tabbedPane1.uiDefaultsGetter = this::getUIDefaultProperty;
tabbedPane1.setTabLayoutPolicy( JTabbedPane.SCROLL_TAB_LAYOUT );
tabbedPane1.addTab( "Tab 1", null );
tabbedPane1.addTab( "Tab 2", null );
@@ -224,7 +228,7 @@ class FlatThemePreview
flatButton1 = new FlatButton();
buttonLabel = new JLabel();
button1 = new JButton();
testDefaultButton1 = new FlatThemePreview.TestDefaultButton();
testDefaultButton1 = new FlatThemePreview.PreviewDefaultButton();
helpButton = new FlatButton();
hSpacer2 = new JPanel(null);
toggleButtonLabel = new JLabel();
@@ -272,7 +276,7 @@ class FlatThemePreview
toolTipLabel = new JLabel();
toolTip1 = new JToolTip();
tabbedPaneLabel = new JLabel();
tabbedPane1 = new JTabbedPane();
tabbedPane1 = new FlatThemePreview.PreviewTabbedPane();
//======== this ========
setLayout(new MigLayout(
@@ -585,7 +589,7 @@ class FlatThemePreview
private FlatButton flatButton1;
private JLabel buttonLabel;
private JButton button1;
private FlatThemePreview.TestDefaultButton testDefaultButton1;
private FlatThemePreview.PreviewDefaultButton testDefaultButton1;
private FlatButton helpButton;
private JPanel hSpacer2;
private JLabel toggleButtonLabel;
@@ -633,12 +637,12 @@ class FlatThemePreview
private JLabel toolTipLabel;
private JToolTip toolTip1;
private JLabel tabbedPaneLabel;
private JTabbedPane tabbedPane1;
private FlatThemePreview.PreviewTabbedPane tabbedPane1;
// JFormDesigner - End of variables declaration //GEN-END:variables
//---- class TestDefaultButton --------------------------------------------
//---- class PreviewDefaultButton -----------------------------------------
private static class TestDefaultButton
private static class PreviewDefaultButton
extends JButton
{
@Override
@@ -646,4 +650,47 @@ class FlatThemePreview
return true;
}
}
//---- class PreviewTabbedPane --------------------------------------------
private static class PreviewTabbedPane
extends JTabbedPane
{
Function<Object, Object> uiDefaultsGetter;
@Override
public void updateUI() {
setUI( new PreviewFlatTabbedPaneUI( uiDefaultsGetter ) );
}
}
//---- class PreviewFlatTabbedPaneUI --------------------------------------
private static class PreviewFlatTabbedPaneUI
extends FlatTabbedPaneUI
{
private final Function<Object, Object> uiDefaultsGetter;
PreviewFlatTabbedPaneUI( Function<Object, Object> uiDefaultsGetter ) {
this.uiDefaultsGetter = uiDefaultsGetter;
}
@Override
protected JButton createMoreTabsButton() {
return new PreviewFlatMoreTabsButton();
}
//---- class PreviewFlatMoreTabsButton --------------------------------
protected class PreviewFlatMoreTabsButton
extends FlatMoreTabsButton
{
@Override
public void actionPerformed( ActionEvent e ) {
FlatLaf.runWithUIDefaultsGetter( uiDefaultsGetter, () -> {
super.actionPerformed( e );
} );
}
}
}
}

4
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.jfd
View File

@@ -62,7 +62,7 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 3,alignx left,growx 0"
} )
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreview$TestDefaultButton" ) {
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreview$PreviewDefaultButton" ) {
name: "testDefaultButton1"
"text": "OK"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
@@ -404,7 +404,7 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 22"
} )
add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
add( new FormContainer( "com.formdev.flatlaf.themeeditor.FlatThemePreview$PreviewTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
name: "tabbedPane1"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 22"