release 3.7

CHANGELOG.md

@@ -1,7 +1,7 @@
 FlatLaf Change Log
 ==================
 
-## 3.7-SNAPSHOT
+## 3.7
 
 #### New features and improvements
 

flatlaf-core/flatlaf-core-sigtest.txt

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 3.6.2
+#Version 3.7
 
 CLSS public abstract interface com.formdev.flatlaf.FlatClientProperties
 fld public final static java.lang.String BUTTON_TYPE = "JButton.buttonType"
@@ -87,6 +87,7 @@ fld public final static java.lang.String TABBED_PANE_TAB_TYPE_UNDERLINED = "unde
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE = "JTabbedPane.tabWidthMode"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_COMPACT = "compact"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_EQUAL = "equal"
+fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_ICON_ONLY = "iconOnly"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_PREFERRED = "preferred"
 fld public final static java.lang.String TABBED_PANE_TRAILING_COMPONENT = "JTabbedPane.trailingComponent"
 fld public final static java.lang.String TAB_BUTTON_SELECTED_BACKGROUND = "JToggleButton.tab.selectedBackground"
@@ -307,6 +308,7 @@ fld public final static java.lang.String USE_JETBRAINS_CUSTOM_DECORATIONS = "fla
 fld public final static java.lang.String USE_NATIVE_LIBRARY = "flatlaf.useNativeLibrary"
 fld public final static java.lang.String USE_ROUNDED_POPUP_BORDER = "flatlaf.useRoundedPopupBorder"
 fld public final static java.lang.String USE_SUB_MENU_SAFE_TRIANGLE = "flatlaf.useSubMenuSafeTriangle"
+fld public final static java.lang.String USE_SYSTEM_FILE_CHOOSER = "flatlaf.useSystemFileChooser"
 fld public final static java.lang.String USE_TEXT_Y_CORRECTION = "flatlaf.useTextYCorrection"
 fld public final static java.lang.String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont"
 fld public final static java.lang.String USE_WINDOW_DECORATIONS = "flatlaf.useWindowDecorations"
@@ -770,6 +772,112 @@ cons public init()
 meth public static <%0 extends java.awt.Component> {%%0} getComponentByName(java.awt.Container,java.lang.String)
 supr java.lang.Object
 
+CLSS public com.formdev.flatlaf.util.SystemFileChooser
+cons public init()
+cons public init(java.io.File)
+cons public init(java.lang.String)
+fld public final static int APPROVE_OPTION = 0
+fld public final static int CANCEL_OPTION = 1
+fld public final static int DIRECTORIES_ONLY = 1
+fld public final static int FILES_ONLY = 0
+fld public final static int OPEN_DIALOG = 0
+fld public final static int SAVE_DIALOG = 1
+fld public final static java.lang.String LINUX_OPTIONS_CLEAR = "linux.optionsClear"
+fld public final static java.lang.String LINUX_OPTIONS_SET = "linux.optionsSet"
+fld public final static java.lang.String MAC_FILTER_FIELD_LABEL = "mac.filterFieldLabel"
+fld public final static java.lang.String MAC_MESSAGE = "mac.message"
+fld public final static java.lang.String MAC_NAME_FIELD_LABEL = "mac.nameFieldLabel"
+fld public final static java.lang.String MAC_OPTIONS_CLEAR = "mac.optionsClear"
+fld public final static java.lang.String MAC_OPTIONS_SET = "mac.optionsSet"
+fld public final static java.lang.String MAC_TREATS_FILE_PACKAGES_AS_DIRECTORIES = "mac.treatsFilePackagesAsDirectories"
+fld public final static java.lang.String WINDOWS_DEFAULT_EXTENSION = "windows.defaultExtension"
+fld public final static java.lang.String WINDOWS_DEFAULT_FOLDER = "windows.defaultFolder"
+fld public final static java.lang.String WINDOWS_FILE_NAME_LABEL = "windows.fileNameLabel"
+fld public final static java.lang.String WINDOWS_OPTIONS_CLEAR = "windows.optionsClear"
+fld public final static java.lang.String WINDOWS_OPTIONS_SET = "windows.optionsSet"
+innr public abstract interface static ApproveCallback
+innr public abstract interface static StateStore
+innr public abstract static ApproveContext
+innr public abstract static FileFilter
+innr public final static FileNameExtensionFilter
+meth public <%0 extends java.lang.Object> {%%0} getPlatformProperty(java.lang.String)
+meth public boolean isAcceptAllFileFilterUsed()
+meth public boolean isDirectorySelectionEnabled()
+meth public boolean isFileHidingEnabled()
+meth public boolean isFileSelectionEnabled()
+meth public boolean isMultiSelectionEnabled()
+meth public boolean removeChoosableFileFilter(com.formdev.flatlaf.util.SystemFileChooser$FileFilter)
+meth public com.formdev.flatlaf.util.SystemFileChooser$ApproveCallback getApproveCallback()
+meth public com.formdev.flatlaf.util.SystemFileChooser$FileFilter getAcceptAllFileFilter()
+meth public com.formdev.flatlaf.util.SystemFileChooser$FileFilter getFileFilter()
+meth public com.formdev.flatlaf.util.SystemFileChooser$FileFilter[] getChoosableFileFilters()
+meth public int getApproveButtonMnemonic()
+meth public int getDialogType()
+meth public int getFileSelectionMode()
+meth public int showDialog(java.awt.Component,java.lang.String)
+meth public int showOpenDialog(java.awt.Component)
+meth public int showSaveDialog(java.awt.Component)
+meth public java.io.File getCurrentDirectory()
+meth public java.io.File getSelectedFile()
+meth public java.io.File[] getSelectedFiles()
+meth public java.lang.String getApproveButtonText()
+meth public java.lang.String getDialogTitle()
+meth public java.lang.String getStateStoreID()
+meth public static com.formdev.flatlaf.util.SystemFileChooser$StateStore getStateStore()
+meth public static void setStateStore(com.formdev.flatlaf.util.SystemFileChooser$StateStore)
+meth public void addChoosableFileFilter(com.formdev.flatlaf.util.SystemFileChooser$FileFilter)
+meth public void putPlatformProperty(java.lang.String,java.lang.Object)
+meth public void resetChoosableFileFilters()
+meth public void setAcceptAllFileFilterUsed(boolean)
+meth public void setApproveButtonMnemonic(char)
+meth public void setApproveButtonMnemonic(int)
+meth public void setApproveButtonText(java.lang.String)
+meth public void setApproveCallback(com.formdev.flatlaf.util.SystemFileChooser$ApproveCallback)
+meth public void setCurrentDirectory(java.io.File)
+meth public void setDialogTitle(java.lang.String)
+meth public void setDialogType(int)
+meth public void setFileFilter(com.formdev.flatlaf.util.SystemFileChooser$FileFilter)
+meth public void setFileHidingEnabled(boolean)
+meth public void setFileSelectionMode(int)
+meth public void setMultiSelectionEnabled(boolean)
+meth public void setSelectedFile(java.io.File)
+meth public void setSelectedFiles(java.io.File[])
+meth public void setStateStoreID(java.lang.String)
+supr java.lang.Object
+hfds acceptAllFileFilter,approveButtonMnemonic,approveButtonText,approveCallback,approveResult,currentDirectory,dialogTitle,dialogType,fileFilter,fileSelectionMode,filters,inMemoryStateStore,keepAcceptAllAtEnd,multiSelection,platformProperties,selectedFile,selectedFiles,stateStore,stateStoreID,useAcceptAllFileFilter,useFileHiding
+hcls AcceptAllFileFilter,FileChooserProvider,LinuxFileChooserProvider,MacFileChooserProvider,SwingFileChooserProvider,SystemFileChooserProvider,WindowsFileChooserProvider
+
+CLSS public abstract interface static com.formdev.flatlaf.util.SystemFileChooser$ApproveCallback
+ outer com.formdev.flatlaf.util.SystemFileChooser
+meth public abstract int approve(java.io.File[],com.formdev.flatlaf.util.SystemFileChooser$ApproveContext)
+
+CLSS public abstract static com.formdev.flatlaf.util.SystemFileChooser$ApproveContext
+ outer com.formdev.flatlaf.util.SystemFileChooser
+cons public init()
+meth public abstract !varargs int showMessageDialog(int,java.lang.String,java.lang.String,int,java.lang.String[])
+supr java.lang.Object
+
+CLSS public abstract static com.formdev.flatlaf.util.SystemFileChooser$FileFilter
+ outer com.formdev.flatlaf.util.SystemFileChooser
+cons public init()
+meth public abstract java.lang.String getDescription()
+supr java.lang.Object
+
+CLSS public final static com.formdev.flatlaf.util.SystemFileChooser$FileNameExtensionFilter
+ outer com.formdev.flatlaf.util.SystemFileChooser
+cons public !varargs init(java.lang.String,java.lang.String[])
+meth public java.lang.String getDescription()
+meth public java.lang.String toString()
+meth public java.lang.String[] getExtensions()
+supr com.formdev.flatlaf.util.SystemFileChooser$FileFilter
+hfds description,extensions
+
+CLSS public abstract interface static com.formdev.flatlaf.util.SystemFileChooser$StateStore
+ outer com.formdev.flatlaf.util.SystemFileChooser
+fld public final static java.lang.String KEY_CURRENT_DIRECTORY = "currentDirectory"
+meth public abstract java.lang.String get(java.lang.String,java.lang.String)
+meth public abstract void put(java.lang.String,java.lang.String)
+
 CLSS public com.formdev.flatlaf.util.SystemInfo
 cons public init()
 fld public final static boolean isAARCH64
@@ -806,13 +914,21 @@ supr java.lang.Object
 
 CLSS public com.formdev.flatlaf.util.UIScale
 cons public init()
+fld public final static java.lang.String PROP_USER_SCALE_FACTOR = "userScaleFactor"
+fld public final static java.lang.String PROP_ZOOM_FACTOR = "zoomFactor"
 meth public static boolean isSystemScalingEnabled()
+meth public static boolean setZoomFactor(float)
+meth public static boolean zoomIn()
+meth public static boolean zoomOut()
+meth public static boolean zoomReset()
 meth public static double getSystemScaleFactor(java.awt.Graphics2D)
 meth public static double getSystemScaleFactor(java.awt.GraphicsConfiguration)
 meth public static float computeFontScaleFactor(java.awt.Font)
 meth public static float getUserScaleFactor()
+meth public static float getZoomFactor()
 meth public static float scale(float)
 meth public static float unscale(float)
+meth public static float[] getSupportedZoomFactors()
 meth public static int scale(int)
 meth public static int scale2(int)
 meth public static int unscale(int)
@@ -822,8 +938,9 @@ meth public static javax.swing.plaf.FontUIResource applyCustomScaleFactor(javax.
 meth public static void addPropertyChangeListener(java.beans.PropertyChangeListener)
 meth public static void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public static void scaleGraphics(java.awt.Graphics2D)
+meth public static void setSupportedZoomFactors(float[])
 supr java.lang.Object
-hfds DEBUG,changeSupport,initialized,jreHiDPI,scaleFactor
+hfds DEBUG,changeSupport,ignoreFontChange,inUnitTests,initialized,jreHiDPI,listenerInitialized,scaleFactor,supportedZoomFactors,unzoomedScaleFactor,zoomFactor
 
 CLSS public java.awt.Color
 cons public init(float,float,float)

flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemFileChooser.java

@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.util;
 
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.KeyboardFocusManager;
 import java.awt.SecondaryLoop;
 import java.awt.Toolkit;
@@ -30,6 +31,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
@@ -265,11 +267,13 @@ public class SystemFileChooser
 
 		@Override
 		public String get( String key, String def ) {
+//			System.out.println( "mem GET " + key + " = " + state.getOrDefault( key, def ) );
 			return state.getOrDefault( key, def );
 		}
 
 		@Override
 		public void put( String key, String value ) {
+//			System.out.println( "mem PUT " + key + " = " + value );
 			if( value != null )
 				state.put( key, value );
 			else
@@ -1317,7 +1321,34 @@ public class SystemFileChooser
 			chooser.setCurrentDirectory( fc.getCurrentDirectory() );
 			chooser.setSelectedFile( fc.getSelectedFile() );
 
-			if( chooser.showDialog( owner, null ) != JFileChooser.APPROVE_OPTION )
+			// restore window size
+			StateStore store = (stateStore != null) ? stateStore : inMemoryStateStore;
+			String keyLastWindowSize = fc.buildStateKey( "lastWindowSize" );
+			String lastWindowSize = store.get( keyLastWindowSize, null );
+			if( lastWindowSize != null ) {
+				try( Scanner s = new Scanner( lastWindowSize ) ) {
+					int width = UIScale.scale( s.nextInt() );
+					int height = UIScale.scale( s.nextInt() );
+					Dimension prefSize = chooser.getPreferredSize();
+					chooser.setPreferredSize( new Dimension(
+						Math.max( width, prefSize.width ),
+						Math.max( height, prefSize.height ) ) );
+				} catch( RuntimeException ex ) {
+					// ignore
+				}
+			}
+
+			// show dialog
+			int result = chooser.showDialog( owner, null );
+
+			// save window size
+			Dimension windowSize = chooser.getSize();
+			if( windowSize.width > 0 && windowSize.height > 0 ) {
+				store.put( keyLastWindowSize, UIScale.unscale( windowSize.width )
+					+ " " + UIScale.unscale( windowSize.height ) );
+			}
+
+			if( result != JFileChooser.APPROVE_OPTION )
 				return null;
 
 			return chooser.isMultiSelectionEnabled()

gradle.properties

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-flatlaf.releaseVersion     = 3.6.2
-flatlaf.developmentVersion = 3.7-SNAPSHOT
+flatlaf.releaseVersion     = 3.7
+flatlaf.developmentVersion = 3.8-SNAPSHOT
 
 org.gradle.configuration-cache = true
 # org.gradle.warning.mode = all