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

Theme Editor: improve order of directories in combobox

Browse Source
This commit is contained in:
Karl Tauber
2023-08-06 18:34:29 +02:00
parent 270e998e86
commit f506ef0d4f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java
View File

@@ -866,7 +866,14 @@ class FlatThemeFileEditor
// restore directories history // restore directories history
String[] directories = getPrefsStrings( state, KEY_DIRECTORIES ); String[] directories = getPrefsStrings( state, KEY_DIRECTORIES );
SortedComboBoxModel<File> model = new SortedComboBoxModel<>( new File[0] ); SortedComboBoxModel<File> model = new SortedComboBoxModel<>( new File[0],
(file1, file2) -> {
// replace path separator with zero to order shorter names before longer
// (e.g. c:\dir\sub before c:\dir2\sub)
String path1 = file1.getPath().replace( '/', '\0' ).replace( '\\', '\0' );
String path2 = file2.getPath().replace( '/', '\0' ).replace( '\\', '\0' );
return path1.compareToIgnoreCase( path2 );
} );
for( String dirStr : directories ) { for( String dirStr : directories ) {
File dir = new File( dirStr ); File dir = new File( dirStr );
if( dir.isDirectory() ) if( dir.isDirectory() )
@@ -1292,13 +1299,9 @@ class FlatThemeFileEditor
private static class SortedComboBoxModel<E> private static class SortedComboBoxModel<E>
extends DefaultComboBoxModel<E> extends DefaultComboBoxModel<E>
{ {
private Comparator<E> comparator; private final Comparator<E> comparator;
public SortedComboBoxModel( E[] items ) { SortedComboBoxModel( E[] items, Comparator<E> c ) {
this( items, null );
}
public SortedComboBoxModel( E[] items, Comparator<E> c ) {
super( sort( items, c ) ); super( sort( items, c ) );
this.comparator = c; this.comparator = c;
} }