Implement UserData.acc.loginBackground

IzK-ArcOS · Oct 20, 2023 · 20f1b3d · 20f1b3d
1 parent de88a13
commit 20f1b3d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/src/css/desktop/apps/exit.css b/src/css/desktop/apps/exit.css
@@ -14,6 +14,7 @@ window#Exit button.option {
   text-align: center;
   padding: 20px 20px;
   background-color: transparent;
+  box-shadow: none;
 }
 
 window#Exit button.option:hover {

diff --git a/src/css/desktop/apps/settings/account/customWallpaper.css b/src/css/desktop/apps/settings/account/customWallpaper.css
@@ -1,42 +1,33 @@
-window#SettingsApp window.overlay#customWallpaper div.customwallpaper-wrapper {
+window#SettingsApp window.overlay div.customwallpaper-wrapper {
   display: flex;
   margin: 5px;
 }
 
-window#SettingsApp
-  window.overlay#customWallpaper
-  div.customwallpaper-wrapper
-  div.field {
+window#SettingsApp window.overlay div.customwallpaper-wrapper div.field {
   width: 100%;
 }
 
-window#SettingsApp
-  window.overlay#customWallpaper
-  div.customwallpaper-wrapper
-  img {
+window#SettingsApp window.overlay div.customwallpaper-wrapper img {
   height: 40px;
   width: 40px;
   margin-right: 10px;
 }
 
-window#SettingsApp
-  window.overlay#customWallpaper
-  div.customwallpaper-wrapper
-  input {
+window#SettingsApp window.overlay div.customwallpaper-wrapper input {
   width: 100%;
   margin: 5px 0;
 }
 
 window#SettingsApp
-  window.overlay#customWallpaper
+  window.overlay
   div.customwallpaper-wrapper
   div.field
   div.apply {
   display: flex;
 }
 
 window#SettingsApp
-  window.overlay#customWallpaper
+  window.overlay
   div.customwallpaper-wrapper
   div.field
   div.apply

diff --git a/src/lib/Apps/Settings/Pages/Account/Overlays/CustomLoginWallpaper.svelte b/src/lib/Apps/Settings/Pages/Account/Overlays/CustomLoginWallpaper.svelte
@@ -28,7 +28,7 @@
   }
 
   function cancel() {
-    hideOverlay("customWallpaper", "SettingsApp");
+    hideOverlay("customLoginWallpaper", "SettingsApp");
   }
 
   async function checkImage(url): Promise<boolean> {

diff --git a/src/ts/userlogic/themes/interface.ts b/src/ts/userlogic/themes/interface.ts
@@ -8,6 +8,7 @@ export interface UserTheme {
   sharp: boolean;
   theme: string;
   wallpaper: string;
+  loginBackground: string;
   taskbarCentered: boolean;
   taskbarLabels: boolean;
   taskbarPosition: "vertical" | "" | "vertical-right" | string;

diff --git a/src/ts/userlogic/themes/main.ts b/src/ts/userlogic/themes/main.ts
@@ -40,6 +40,9 @@ export function loadTheme(context: UserTheme) {
     udata.sh.window.centertb = !!context.titlebarCentered;
     udata.sh.taskbar.isLauncher = !!context.isLauncher;
 
+    if (context.loginBackground)
+      udata.acc.loginBackground = context.loginBackground;
+
     return udata;
   });
 }
@@ -57,6 +60,7 @@ export function saveCurrentTheme(name: string) {
       sharp: udata.sh.desktop.sharp,
       theme: udata.sh.desktop.theme,
       wallpaper: udata.sh.desktop.wallpaper,
+      loginBackground: udata.acc.loginBackground || "img15",
       accent: udata.sh.desktop.accent,
       docked: udata.sh.taskbar.docked,
       taskbarCentered: udata.sh.taskbar.centered,