mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug, where default lookandfeel overrides settings-lookandfeel

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12190 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-03-28 08:00:56 +00:00
committed by wolf.posdorfer
parent 0cea49b718
commit e7a5fe2603
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/jivesoftware/Spark.java
View File

@ -213,10 +213,10 @@ public final class Spark {
private void loadLookAndFeel() {
final LocalPreferences preferences = SettingsManager.getLocalPreferences();
final String laf;
if (Default.getString(Default.DEFAULT_LOOK_AND_FEEL).length() > 0) {
laf = Default.getString(Default.DEFAULT_LOOK_AND_FEEL);
} else if (preferences.getLookAndFeel().length() > 0) {
if (preferences.getLookAndFeel().length() > 0 && !Default.getBoolean("LOOK_AND_FEEL_DISABLED")) {
laf = preferences.getLookAndFeel();
} else if (Default.getString(Default.DEFAULT_LOOK_AND_FEEL).length() > 0) {
laf = Default.getString(Default.DEFAULT_LOOK_AND_FEEL);
} else {
laf = UIManager.getSystemLookAndFeelClassName();
}