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

OptionPane: fixed button order on Mac

Browse Source
This commit is contained in:
Karl Tauber
2019-11-18 17:18:52 +01:00
parent 84db2f9b65
commit 321c49ee32
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -40,6 +40,7 @@ import com.formdev.flatlaf.util.ColorFunctions;
import com.formdev.flatlaf.util.DerivedColor; import com.formdev.flatlaf.util.DerivedColor;
import com.formdev.flatlaf.util.ScaledNumber; import com.formdev.flatlaf.util.ScaledNumber;
import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.StringUtils;
import com.formdev.flatlaf.util.SystemInfo;
/** /**
* Load UI defaults from properties files associated to Flat LaF classes and add to UI defaults. * Load UI defaults from properties files associated to Flat LaF classes and add to UI defaults.
@@ -96,6 +97,27 @@ class UIDefaultsLoader
} }
} }
// collect all platform specific keys (but do not modify properties)
ArrayList<String> platformSpecificKeys = new ArrayList<>();
for( Object key : properties.keySet() ) {
if( ((String)key).startsWith( "[" ) )
platformSpecificKeys.add( (String) key );
}
// remove platform specific properties and re-add only properties
// for current platform, but with platform prefix removed
if( !platformSpecificKeys.isEmpty() ) {
String platformPrefix =
SystemInfo.IS_WINDOWS ? "[win]" :
SystemInfo.IS_MAC ? "[mac]" :
SystemInfo.IS_LINUX ? "[linux]" : "[unknown]";
for( String key : platformSpecificKeys ) {
Object value = properties.remove( key );
if( key.startsWith( platformPrefix ) )
properties.put( key.substring( platformPrefix.length() ), value );
}
}
Function<String, String> resolver = value -> { Function<String, String> resolver = value -> {
return resolveValue( properties, value ); return resolveValue( properties, value );
}; };

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -206,6 +206,7 @@ OptionPane.buttonMinimumWidth={scaledNumber}72
OptionPane.sameSizeButtons=true OptionPane.sameSizeButtons=true
OptionPane.setButtonMargin=false OptionPane.setButtonMargin=false
OptionPane.buttonOrientation=4 OptionPane.buttonOrientation=4
[mac]OptionPane.isYesLast=true
OptionPane.errorIcon=com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon OptionPane.errorIcon=com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon
OptionPane.informationIcon=com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon OptionPane.informationIcon=com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon