diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 2d407c1f..7dec7151 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -450,10 +450,14 @@ "settings.header.visual": "Visual", "settings.header.visual.description": "Adjust the visual settings for Cider.", "settings.option.visual.windowStyle": "Window Style", + "settings.option.visual.customAccentColor": "Custom Accent Color", + "settings.option.visual.accentColor": "Accent Color", + "settings.option.visual.windowColor": "Window Tint Color", "settings.option.visual.windowBackgroundStyle": "Window Background Style", "settings.header.visual.windowBackgroundStyle.none": "None", "settings.header.visual.windowBackgroundStyle.artwork": "Artwork", "settings.header.visual.windowBackgroundStyle.image": "Image", + "settings.header.visual.windowBackgroundStyle.color": "Color Tint", "settings.option.visual.animatedArtwork": "Animated Artwork", "settings.header.visual.animatedArtwork.always": "Always", "settings.header.visual.animatedArtwork.limited": "Limited to pages and special entries", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 9241a57b..93eab6e8 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -205,7 +205,10 @@ export class Store { }, "windowControlPosition": 0, // 0 default right "nativeTitleBar": false, - "uiScale": 1.0 + "uiScale": 1.0, + "windowColor": "#000000", + "customAccentColor": false, + "accentColor": "#fc3c44" }, "lyrics": { "enable_mxm": false, diff --git a/src/renderer/less/ameframework.less b/src/renderer/less/ameframework.less index 38c56508..de057c2f 100644 --- a/src/renderer/less/ameframework.less +++ b/src/renderer/less/ameframework.less @@ -23,6 +23,10 @@ padding: 14px; background: var(--opaquePageBGColor); font-size: 0.85em; + + &.child { + background: rgb(0 0 0 / 15%); + } } .md-option-segment.md-option-segment_auto { diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 96c5aa03..5cdb4a08 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -283,6 +283,17 @@ const app = new Vue({ ipcRenderer.invoke("renderer-ready", true) document.querySelector("#LOADER").remove() }, + getAppStyle() { + let finalStyle = {} + if(this.cfg.visual.window_background_style === "color") { + finalStyle["background-color"] = this.cfg.visual.windowColor + } + if(this.cfg.visual.customAccentColor) { + finalStyle["--keyColor"] = this.cfg.visual.accentColor + finalStyle["--songProgressColor"] = this.cfg.visual.accentColor + } + return finalStyle + }, setTimeout(func, time) { return setTimeout(func, time); }, diff --git a/src/renderer/style.less b/src/renderer/style.less index 93b6d60f..3fb0f74c 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -31,6 +31,7 @@ --selected-click: rgb(80 80 80 / 30%); --hover: rgb(200 200 200 / 10%); // --keyColor: #fa586a; + --keyColorDefault: @keyColor; --keyColor: @keyColor; --keyColor-rgb: 250, 88, 106; --keyColor-rollover: #ff8a9c; diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 0b656d5e..5454dbd0 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -71,7 +71,7 @@
<%- include("../assets/cider-round.svg") %>
-
+
<%- include('app/chrome-top'); %> diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 88b8fe74..ec6f082c 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -96,7 +96,8 @@ - + @@ -124,7 +125,8 @@
@@ -135,7 +137,8 @@
@@ -185,17 +188,17 @@ - +
{{$root.getLz('settings.option.general.keybindings')}}
-
-
+
{{$root.getLz('settings.option.general.themeUpdateNotification')}} @@ -206,7 +209,7 @@ switch/>
-
+
{{$root.getLz('settings.option.general.showLovedTracksInline')}} @@ -217,7 +220,7 @@ switch/>
-
+ @@ -241,7 +244,8 @@ - @@ -334,7 +338,8 @@ -
+
{{$root.getLz('settings.option.audio.dbspl.display')}}
@@ -408,6 +413,9 @@ + @@ -415,6 +423,113 @@
+
+
+ {{$root.getLz('settings.option.visual.windowColor')}} +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.visual.customAccentColor')}} +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.visual.accentColor')}} +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.visual.hardwareAcceleration')}}
+ ({{$root.getLz('settings.option.visual.hardwareAcceleration.description')}}) +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.visual.showPersonalInfo')}} +
+
+ +
+
+
+ +
+ {{$root.getLz('settings.header.window')}} +
+
+
+
+ {{$root.getLz("settings.option.window.close_button_hide")}} +
+
+ +
+
+
+
+ {{$root.getLz("settings.option.window.useNativeTitleBar")}}
+ ({{$root.getLz("settings.option.visual.hardwareAcceleration.description")}}) +
+
+ +
+
+
+
+ {{$root.getLz("settings.option.window.windowControlStyle")}} +
+
+ +
+
+
+ +
+ {{$root.getLz('settings.header.advanced')}} +
+
{{$root.getLz('settings.option.visual.animatedArtwork')}} @@ -483,83 +598,8 @@
-
-
- {{$root.getLz('settings.option.visual.hardwareAcceleration')}}
- ({{$root.getLz('settings.option.visual.hardwareAcceleration.description')}}) -
-
- -
-
-
-
- {{$root.getLz('settings.option.visual.showPersonalInfo')}} -
-
- -
-
-
- -
- {{$root.getLz('settings.header.window')}} -
-
-
-
- {{$root.getLz("settings.option.window.close_button_hide")}} -
-
- -
-
-
-
- {{$root.getLz("settings.option.window.useNativeTitleBar")}}
- ({{$root.getLz("settings.option.visual.hardwareAcceleration.description")}}) -
-
- -
-
-
-
- {{$root.getLz("settings.option.window.windowControlStyle")}} -
-
- -
-
+ @@ -1047,7 +1087,8 @@
@@ -1185,7 +1226,8 @@