Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Provide fallback values for icon colors with System theme

Browse source
This commit is contained in:
Jannis Weis 2022-04-25 23:46:58 +02:00
parent 2cb9b80815
commit 60b0926dd6
No known key found for this signature in database
GPG key ID: 7C9D8D4B558049AB
1 changed files with 65 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/the/bytecode/club/bytecodeviewer/gui/theme/LAFTheme.java
View file

@ -2,17 +2,17 @@ package the.bytecode.club.bytecodeviewer.gui.theme;
import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.LafManager;
import com.github.weisj.darklaf.listener.UIUpdater; import com.github.weisj.darklaf.listener.UIUpdater;
import com.github.weisj.darklaf.theme.DarculaTheme; import com.github.weisj.darklaf.properties.icons.IconLoader;
import com.github.weisj.darklaf.theme.HighContrastDarkTheme; import com.github.weisj.darklaf.theme.*;
import com.github.weisj.darklaf.theme.HighContrastLightTheme;
import com.github.weisj.darklaf.theme.IntelliJTheme;
import com.github.weisj.darklaf.theme.OneDarkTheme;
import com.github.weisj.darklaf.theme.SolarizedDarkTheme;
import com.github.weisj.darklaf.theme.SolarizedLightTheme;
import java.awt.*; import java.awt.*;
import java.util.Properties;
import javax.swing.*; import javax.swing.*;
import javax.swing.text.JTextComponent;
import com.github.weisj.darklaf.theme.info.PresetIconRule;
import com.github.weisj.darklaf.theme.spec.ColorToneRule;
import org.checkerframework.checker.guieffect.qual.UI;
import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.BytecodeViewer;
import the.bytecode.club.bytecodeviewer.Configuration; import the.bytecode.club.bytecodeviewer.Configuration;
import the.bytecode.club.bytecodeviewer.gui.components.SettingsDialog; import the.bytecode.club.bytecodeviewer.gui.components.SettingsDialog;
@ -134,11 +134,18 @@ public enum LAFTheme
LafManager.install(new HighContrastLightTheme()); LafManager.install(new HighContrastLightTheme());
break; break;
} }
//test theme installed correctly //test theme installed correctly
if(darkLAF) if(darkLAF)
failSafe(); failSafe();
if (!LafManager.isInstalled())
{
setupIconColors();
// Invalidate themed icons
IconLoader.updateThemeStatus(new Object());
}
Configuration.showDarkLAFComponentIcons = darkLAF; Configuration.showDarkLAFComponentIcons = darkLAF;
if(BytecodeViewer.viewer != null) if(BytecodeViewer.viewer != null)
@ -157,7 +164,7 @@ public enum LAFTheme
SettingsDialog.dialogs.forEach(Dialog::dispose); SettingsDialog.dialogs.forEach(Dialog::dispose);
} }
} }
/** /**
* Attempts to failsafe by forcing an error before the mainviewer is called. * Attempts to failsafe by forcing an error before the mainviewer is called.
* It then defaults to the system theme * It then defaults to the system theme
@ -184,4 +191,52 @@ public enum LAFTheme
UIUpdater.registerComponent(comp); UIUpdater.registerComponent(comp);
} }
} }
private void setupIconColors()
{
Properties properties = new Properties();
JTextComponent colorTemplateComponent = new JTextField();
properties.put("textForeground", colorTemplateComponent.getForeground());
colorTemplateComponent.setEnabled(false);
properties.put("textForegroundInactive", colorTemplateComponent.getForeground());
properties.put("textSelectionForeground", colorTemplateComponent.getSelectedTextColor());
new LightIconThemeSupplier().loadIconTheme(properties, UIManager.getDefaults(), IconLoader.get());
UIManager.getLookAndFeelDefaults().putAll(properties);
}
private static class LightIconThemeSupplier extends Theme
{
@Override
protected PresetIconRule getPresetIconRule()
{
return PresetIconRule.LIGHT;
}
@Override
public String getPrefix()
{
return "DO NOT USE";
}
@Override
public String getName()
{
return getPrefix();
}
@Override
protected Class<? extends Theme> getLoaderClass()
{
return LightIconThemeSupplier.class;
}
@Override
public ColorToneRule getColorToneRule()
{
return ColorToneRule.LIGHT;
}
}
} }