Skip to content

Keep taskbar app order stable #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidyen1124 merged 1 commit into from
Sep 16, 2025
Merged

Keep taskbar app order stable #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions src/components/Taskbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import clsx from 'clsx'
import {
forwardRef,
useEffect,
useLayoutEffect,
useMemo,
useRef,
useState,
} from 'react'
import { forwardRef, useEffect, useLayoutEffect, useRef, useState } from 'react'
import StartMenu from './StartMenu'
import { useWindowManager } from '../contexts/WindowManagerContext'

Expand Down Expand Up @@ -151,11 +144,6 @@ export default function Taskbar() {
}
}, [open])

const orderedWindows = useMemo(
() => [...windows].sort((a, b) => a.zIndex - b.zIndex),
[windows]
)

return (
<div
className={`relative flex h-[40px] items-center gap-2 bg-[#C0C0C0] px-3 text-[13px] ${taskbarFrame}`}
Expand All @@ -169,7 +157,7 @@ export default function Taskbar() {
<Divider />

<div className="flex h-9 flex-1 items-center gap-1 overflow-x-auto overflow-y-hidden border-t border-l border-white border-b-[2px] border-r-[2px] border-[#808080] bg-[#C0C0C0] px-2">
{orderedWindows.map(window => {
{windows.map(window => {
const definition = apps[window.appId]
const isActive = activeWindowId === window.id && !window.minimized

Expand Down