Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions src/apps/components/shell/Shell.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

const { process }: AppComponentProps<IShellRuntime> = $props();
const { userPreferences, startMenuOpened, actionCenterOpened, username, FullscreenCount } = process;
const { InitComplete } = Daemon;

let currentDesktop = $state<string>();

Expand All @@ -28,27 +29,29 @@
});
</script>

<div
class="shell taskbar-bounds fullscreen"
class:docked={$userPreferences.shell.taskbar.docked}
class:has-fullscreen={currentDesktop && $FullscreenCount[currentDesktop]?.size > 0}
>
<div class="primary">
<VirtualDesktops {process} />
<VirtualDesktopIndicator {process} />
<StartMenu {userPreferences} {startMenuOpened} {process} {username} />
<div></div>
<ActionCenter {actionCenterOpened} {userPreferences} {process} />
<PushNotification {process} />
{#if Daemon.userInfo.isSystem}
<div class="desktop-watermark">
ArcOS v{ArcOSVersion}-{ArcMode()}_{ArcBuild()}<br />
{Daemon.username}@{Server.hostname}<br />
THIS IS A SYSTEM ACCOUNT. WATCH OUT.
</div>
{/if}
{#if $InitComplete}
<div
class="shell taskbar-bounds fullscreen"
class:docked={$userPreferences.shell.taskbar.docked}
class:has-fullscreen={currentDesktop && $FullscreenCount[currentDesktop]?.size > 0}
>
<div class="primary">
<VirtualDesktops {process} />
<VirtualDesktopIndicator {process} />
<StartMenu {userPreferences} {startMenuOpened} {process} {username} />
<div></div>
<ActionCenter {actionCenterOpened} {userPreferences} {process} />
<PushNotification {process} />
{#if Daemon.userInfo.isSystem}
<div class="desktop-watermark">
ArcOS v{ArcOSVersion}-{ArcMode()}_{ArcBuild()}<br />
{Daemon.username}@{Server.hostname}<br />
THIS IS A SYSTEM ACCOUNT. WATCH OUT.
</div>
{/if}
</div>
<div class="secondary">
<Taskbar {process} />
</div>
</div>
<div class="secondary">
<Taskbar {process} />
</div>
</div>
{/if}
4 changes: 0 additions & 4 deletions src/apps/components/shell/Shell/ActionCenter.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import type { BooleanStore } from "$types/shared/writable";
import type { UserPreferencesStore } from "$types/user";
import { QuickSettings } from "../store";
import CardStack from "./ActionCenter/CardStack.svelte";
import Clock from "./ActionCenter/Clock.svelte";
import Notifications from "./ActionCenter/Notifications.svelte";
import QuickSetting from "./ActionCenter/QuickSetting.svelte";
Expand All @@ -22,9 +21,6 @@
<div class="actioncenter shell-colored" class:colored={$userPreferences.shell.taskbar.colored} class:opened={$actionCenterOpened}>
<div class="top">
<Clock />
{#if !process.safeMode}
<CardStack {userPreferences} {process} />
{/if}
</div>
<Notifications {process} />
{#if !process.safeMode}
Expand Down
67 changes: 0 additions & 67 deletions src/apps/components/shell/Shell/ActionCenter/CardStack.svelte

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions src/apps/components/shell/Shell/Taskbar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import StartButton from "./Taskbar/StartButton.svelte";
import Clock from "./Taskbar/SystemArea/Clock.svelte";
import SystemTray from "./Taskbar/SystemTray.svelte";
import TaskbarWeatherApplet from "./Taskbar/TaskbarWeatherApplet.svelte";
import WorkspaceManagerButton from "./Taskbar/WorkspaceManagerButton.svelte";

const { process }: { process: IShellRuntime } = $props();
Expand All @@ -26,6 +27,7 @@
<PinnedApps {process} />
<OpenedApps {process} />

<TaskbarWeatherApplet {process} />
<ServiceGate id="TrayHostSvc">
{#snippet ifActive(service: ITrayHostService)}
<SystemTray {process} {service} />
Expand Down
Loading
Loading