From 47c4d508e08d3c685293ca2e1e025b775489a943 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 28 Jan 2021 23:26:16 +0100 Subject: [PATCH] Demo: updated screenshot mode --- .../com/formdev/flatlaf/demo/FlatLafDemo.java | 5 +++- .../flatlaf/demo/MoreComponentsPanel.java | 1 + .../com/formdev/flatlaf/demo/TabsPanel.java | 25 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java index 3e24a316..c9c88fad 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java @@ -40,6 +40,9 @@ public class FlatLafDemo if( SystemInfo.isMacOS && System.getProperty( "apple.laf.useScreenMenuBar" ) == null ) System.setProperty( "apple.laf.useScreenMenuBar", "true" ); + if( FlatLafDemo.screenshotsMode && !SystemInfo.isJava_9_orLater && System.getProperty( "flatlaf.uiScale" ) == null ) + System.setProperty( "flatlaf.uiScale", "2x" ); + SwingUtilities.invokeLater( () -> { DemoPrefs.init( PREFS_ROOT_PATH ); @@ -61,7 +64,7 @@ public class FlatLafDemo DemoFrame frame = new DemoFrame(); if( FlatLafDemo.screenshotsMode ) - frame.setPreferredSize( new Dimension( 1280, 620 ) ); + frame.setPreferredSize( new Dimension( 1660, 840 ) ); // show frame frame.pack(); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java index 95b1c72a..f2a3c51d 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java @@ -481,6 +481,7 @@ class MoreComponentsPanel indeterminateCheckBox, toolTipLabel, toolTip1, toolTip2, toolBarLabel, toolBar1, toolBar2, + splitPaneLabel, splitPane3, }; for( Component c : components ) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java index 1540a5d6..067a2cde 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java @@ -25,6 +25,8 @@ import javax.swing.*; import javax.swing.border.*; import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon; +import net.miginfocom.layout.AC; +import net.miginfocom.layout.ConstraintParser; import net.miginfocom.swing.*; /** @@ -1009,6 +1011,29 @@ class TabsPanel tabsPopupPolicyButtonGroup.add(popupAsNeededButton); tabsPopupPolicyButtonGroup.add(popupNeverButton); // JFormDesigner - End of component initialization //GEN-END:initComponents + + if( FlatLafDemo.screenshotsMode ) { + Component[] components = new Component[] { + tabPlacementLabel, tabPlacementToolBar, tabPlacementTabbedPane, + iconBottomTabbedPane, iconTrailingTabbedPane, + alignLeadingTabbedPane, alignTrailingTabbedPane, alignFillTabbedPane, + panel3, separator2, panel4, + }; + + for( Component c : components ) + c.setVisible( false ); + + // remove gaps + MigLayout layout1 = (MigLayout) panel1.getLayout(); + AC rowSpecs1 = ConstraintParser.parseRowConstraints( (String) layout1.getRowConstraints() ); + rowSpecs1.gap( "0!", 0, 1 ); + layout1.setRowConstraints( rowSpecs1 ); + + MigLayout layout2 = (MigLayout) panel2.getLayout(); + AC rowSpecs2 = ConstraintParser.parseRowConstraints( (String) layout2.getRowConstraints() ); + rowSpecs2.gap( "0!", 2, 4, 8 ); + layout2.setRowConstraints( rowSpecs2 ); + } } // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables