mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 19:57:28 +00:00
Code Issues Projects Releases Wiki Activity

MacOS Should use SparkMacLight LaF use by default

Browse Source
This commit is contained in:
ilya khlevnoy 2023-05-03 23:51:52 +03:00
parent 7ab78a05a7
commit a3984d8297
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/jivesoftware/resource/Default.java
View File

@ -73,6 +73,7 @@ public class Default {
public static final String FRAME_IMAGE = "FRAME_IMAGE";
public static final String LOOK_AND_FEEL_DISABLED = "LOOK_AND_FEEL_DISABLED";
public static final String DEFAULT_LOOK_AND_FEEL = "DEFAULT_LOOK_AND_FEEL";
public static final String DEFAULT_LOOK_AND_FEEL_MAC = "DEFAULT_LOOK_AND_FEEL_MAC";
public static final String INSTALL_PLUGINS_DISABLED = "INSTALL_PLUGINS_DISABLED";
public static final String UNINSTALL_PLUGINS_DISABLED = "UNINSTALL_PLUGINS_DISABLED";
public static final String ADVANCED_DISABLED = "ADVANCED_DISABLED";

2
core/src/main/java/org/jivesoftware/spark/ui/themes/LookAndFeelManager.java
View File

@ -107,7 +107,7 @@ public class LookAndFeelManager {
private static String getLookandFeel(LocalPreferences preferences) {
String result;
String whereToLook = Default.DEFAULT_LOOK_AND_FEEL;
String whereToLook = Spark.isMac() ? Default.DEFAULT_LOOK_AND_FEEL_MAC : Default.DEFAULT_LOOK_AND_FEEL;
if (!Default.getBoolean(Default.LOOK_AND_FEEL_DISABLED)) {
result = preferences.getLookAndFeel();

3
core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java
View File

@ -966,7 +966,8 @@ public class LocalPreferences {
public String getLookAndFeel() {
String defaultstring;
try {
defaultstring = Default.getString(Default.DEFAULT_LOOK_AND_FEEL);
defaultstring = Spark.isMac() ? Default.getString(Default.DEFAULT_LOOK_AND_FEEL_MAC)
: Default.getString(Default.DEFAULT_LOOK_AND_FEEL);
} catch (Exception e) {
defaultstring = UIManager.getSystemLookAndFeelClassName();
}

1
core/src/main/resources/default.properties
View File

@ -318,6 +318,7 @@ CHANGE_COLORS_DISABLED =
# Changes the Default Look&Feel, if empty it will load the SystemSkin
# Default Spark skin is org.jivesoftware.spark.ui.themes.lafs.SparkLightLaf
DEFAULT_LOOK_AND_FEEL = org.jivesoftware.spark.ui.themes.lafs.SparkLightLaf
DEFAULT_LOOK_AND_FEEL_MAC = org.jivesoftware.spark.ui.themes.lafs.SparkMacLightLaf
# tabs are placed on bottom by default. if set to true will be placed on top
TABS_PLACEMENT_TOP =