支持主题色跟随系统 (#6385)
This commit is contained in:
1 parent
26a874a030
commit
d8a03cfed8
7 files changed
+31
-1
No files matched your search
@@ -25,6 +25,9 @@ public enum ThemeColorType {
|
||||
/// Uses the built-in launcher default theme color.
|
||||
DEFAULT,
|
||||
|
||||
/// Follows the accent color provided by the operating system.
|
||||
SYSTEM,
|
||||
|
||||
/// Uses the custom launcher theme color selected by the user.
|
||||
CUSTOM,
|
||||
|
||||
|
||||
@@ -712,6 +712,9 @@ public final class ThemePackManager {
|
||||
if (themeColorType == ThemeColorType.DEFAULT) {
|
||||
return ThemeColorSource.DEFAULT;
|
||||
}
|
||||
if (themeColorType == ThemeColorType.SYSTEM) {
|
||||
return ThemeColorSource.custom(Themes.getSystemThemeColor());
|
||||
}
|
||||
if (themeColorType == ThemeColorType.BACKGROUND) {
|
||||
if (backgroundType == BackgroundType.THEME_COLOR) {
|
||||
return ThemeColorSource.DEFAULT;
|
||||
|
||||
@@ -112,6 +112,9 @@ public final class Themes {
|
||||
if (FXUtils.DARK_MODE != null) {
|
||||
observables.add(FXUtils.DARK_MODE);
|
||||
}
|
||||
if (FXUtils.ACCENT_COLOR != null) {
|
||||
observables.add(FXUtils.ACCENT_COLOR);
|
||||
}
|
||||
bind(observables.toArray(new Observable[0]));
|
||||
}
|
||||
|
||||
@@ -192,6 +195,7 @@ public final class Themes {
|
||||
}
|
||||
return switch (themeColorType) {
|
||||
case DEFAULT -> ThemeColor.DEFAULT;
|
||||
case SYSTEM -> getSystemThemeColor();
|
||||
case CUSTOM -> fallback;
|
||||
case BACKGROUND -> resolveWallpaperThemeColor(fallback, backgroundType);
|
||||
};
|
||||
@@ -527,6 +531,15 @@ public final class Themes {
|
||||
return defaultBrightness = brightness;
|
||||
}
|
||||
|
||||
/// Returns the current operating system accent color, or the launcher default when unavailable.
|
||||
public static ThemeColor getSystemThemeColor() {
|
||||
if (FXUtils.ACCENT_COLOR == null) {
|
||||
return ThemeColor.DEFAULT;
|
||||
}
|
||||
@Nullable Color accentColor = FXUtils.ACCENT_COLOR.get();
|
||||
return accentColor != null ? ThemeColor.of(accentColor) : ThemeColor.DEFAULT;
|
||||
}
|
||||
|
||||
/// Returns the current resolved launcher theme.
|
||||
public static ResolvedTheme getTheme() {
|
||||
return theme.get();
|
||||
|
||||
@@ -500,6 +500,10 @@ public class PersonalizationPage extends StackPane {
|
||||
i18n("settings.launcher.theme_color_type.default"),
|
||||
ThemeColorType.DEFAULT);
|
||||
|
||||
var systemColorChoice = new RadioChoiceList.Choice<ThemeColorType>(
|
||||
i18n("settings.launcher.theme_color_type.system"),
|
||||
ThemeColorType.SYSTEM);
|
||||
|
||||
var customColorChoice = new RadioChoiceList.Choice<ThemeColorType>(
|
||||
i18n("settings.launcher.theme_color_type.custom"),
|
||||
ThemeColorType.CUSTOM) {
|
||||
@@ -516,7 +520,11 @@ public class PersonalizationPage extends StackPane {
|
||||
|
||||
RadioChoiceList<ThemeColorType> themeColorChoiceList = new RadioChoiceList<>();
|
||||
themeColorChoiceList.setFallbackValue(ThemeColorType.DEFAULT);
|
||||
themeColorChoiceList.setChoices(Arrays.asList(defaultColorChoice, customColorChoice, backgroundColorChoice));
|
||||
themeColorChoiceList.setChoices(Arrays.asList(
|
||||
defaultColorChoice,
|
||||
systemColorChoice,
|
||||
customColorChoice,
|
||||
backgroundColorChoice));
|
||||
|
||||
JFXButton themeColorOverrideButton = createThemeAppearanceOverrideButton();
|
||||
themeColorSublist.setTitleRight(themeColorOverrideButton);
|
||||
|
||||
@@ -1606,6 +1606,7 @@ settings.launcher.theme_color_type.background=Follow Background Wallpaper
|
||||
settings.launcher.theme_color_type.custom=Custom Color
|
||||
settings.launcher.theme_color_type.custom.description=Use the color selected above.
|
||||
settings.launcher.theme_color_type.default=Default
|
||||
settings.launcher.theme_color_type.system=Follow System
|
||||
settings.launcher.title_transparent=Transparent Titlebar
|
||||
settings.launcher.turn_off_animations=Disable Animation
|
||||
settings.launcher.version_list_source=Version List
|
||||
|
||||
@@ -1397,6 +1397,7 @@ settings.launcher.theme_color_type.background=跟隨背景圖片
|
||||
settings.launcher.theme_color_type.custom=自訂顏色
|
||||
settings.launcher.theme_color_type.custom.description=使用上方選擇的顏色。
|
||||
settings.launcher.theme_color_type.default=預設
|
||||
settings.launcher.theme_color_type.system=跟隨系統
|
||||
settings.launcher.title_transparent=標題欄透明
|
||||
settings.launcher.turn_off_animations=關閉動畫
|
||||
settings.launcher.version_list_source=版本清單來源
|
||||
|
||||
@@ -1402,6 +1402,7 @@ settings.launcher.theme_color_type.background=跟随背景壁纸
|
||||
settings.launcher.theme_color_type.custom=自定义颜色
|
||||
settings.launcher.theme_color_type.custom.description=使用上方选择的颜色。
|
||||
settings.launcher.theme_color_type.default=默认
|
||||
settings.launcher.theme_color_type.system=跟随系统
|
||||
settings.launcher.title_transparent=标题栏透明
|
||||
settings.launcher.turn_off_animations=关闭动画
|
||||
settings.launcher.version_list_source=版本列表源
|
||||
|
||||
Reference in new issue
Block a user