Skip to content
Merged
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@trpc/server": "11.18.0",
"anchorme": "^3.0.8",
"astro": "7.0.3",
"css95": "^0.2.0",
"css95": "^0.3.0",
"solid-js": "^1.9.13",
"solid-markdown": "^2.1.1",
"tsx": "^4.22.4",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Wes95/components/Explorer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
} from '../system/FileSystem/registry';
import { isAppURL } from '../utils/url';
import { createWindowURL } from '../utils/Windows';
import { ExplorerList } from './ExplorerList';
import { Icon } from './Icon';
import { ItemList } from './ItemList';
import { MenuButton } from './MenuButton';
import { Window } from './Window';

Expand Down Expand Up @@ -222,7 +222,7 @@ export const Explorer = () => {
onClick={handleDesktopTaskbarClick}
ref={desktopRef}
>
<ItemList
<ExplorerList
appearance="icons-vertical"
items={[
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type Item = {
columns?: Record<string, { value: string; sortValue: string | number }>;
};

export function ItemList(p: {
export function ExplorerList(p: {
appearance?: 'icons' | 'icons-vertical' | 'list' | 'details';
columns?: { key: string; name: string }[];
items: Item[];
Expand All @@ -22,16 +22,18 @@ export function ItemList(p: {
return (
<Switch>
<Match when={p.appearance === 'details'}>
<table class="ItemList -table">
<table class="ExplorerList -details">
<thead>
<tr>
<th>
<Button class="HeaderButton">Name</Button>
<Button class="ExplorerListHeaderButton">Name</Button>
</th>
<For each={p.columns}>
{(column) => (
<th>
<Button class="HeaderButton">{column.name}</Button>
<Button class="ExplorerListHeaderButton">
{column.name}
</Button>
</th>
)}
</For>
Expand All @@ -40,7 +42,7 @@ export function ItemList(p: {
<tbody>
<For each={p.items}>
{(item) => (
<tr class="Item">
<tr class="ExplorerListItem">
<td>
<button
class="LinkButton"
Expand All @@ -63,7 +65,7 @@ export function ItemList(p: {
<Match when={p.appearance !== 'details'}>
<ul
classList={{
ItemList: true,
ExplorerList: true,
'-icons':
p.appearance === 'icons' || p.appearance === 'icons-vertical',
'-list':
Expand All @@ -74,7 +76,7 @@ export function ItemList(p: {
>
<For each={p.items}>
{(item) => (
<li class="Item">
<li class="ExplorerListItem">
<Button appearance="Link" onClick={() => handleItemClick(item)}>
<Icon
icon={item.icon}
Expand All @@ -85,7 +87,7 @@ export function ItemList(p: {
: 'small'
}
/>
<span class="ItemLabel">{item.name}</span>
<span class="ExplorerListItemLabel">{item.name}</span>
</Button>
</li>
)}
Expand Down
16 changes: 7 additions & 9 deletions src/Wes95/components/Window.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { WindowTitleButton } from 'css95/solid';
import {
createContext,
createEffect,
Expand Down Expand Up @@ -389,38 +390,35 @@ export function Window(p: {
<div class="WindowTitleButtons">
<Show when={!p.window.parentId && p.window.showInTaskbar}>
<Show when={p.window.minimizable}>
<button
<WindowTitleButton
aria-label="Minimize"
type="button"
class="WindowTitleButton"
onClick={handleMinimize}
>
<Symbol symbol="windowMinimize" />
</button>
</WindowTitleButton>
</Show>
<Show when={p.window.maximizable}>
<button
<WindowTitleButton
aria-label={p.window.maximized ? 'Restore' : 'Maximize'}
type="button"
class="WindowTitleButton"
onClick={handleMaximize}
>
<Symbol
symbol={
p.window.maximized ? 'windowRestore' : 'windowMaximize'
}
/>
</button>
</WindowTitleButton>
</Show>
</Show>
<button
<WindowTitleButton
aria-label="Close"
type="button"
class="WindowTitleButton"
onClick={() => windowManager.closeWindow(p.window.id)}
>
<Symbol symbol="windowClose" />
</button>
</WindowTitleButton>
</div>
</div>
<div
Expand Down
6 changes: 5 additions & 1 deletion src/Wes95/programs/Bluesky/PostList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ export function BlueskyPostList(p: {
[styles.PostList!]: true,
}}
>
<div class="Content Vertical" ref={p.contentRef} onScroll={handleScroll}>
<div
class="FieldContent Vertical"
ref={p.contentRef}
onScroll={handleScroll}
>
<Show when={p.filter === 'posts'}>
<div class={styles.PostProfileDescription!}>{description()}</div>
<hr class={styles.PostSeparator!} />
Expand Down
6 changes: 5 additions & 1 deletion src/Wes95/programs/Bluesky/PostSearchWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ export function BlueskyPostSearchWindow(p: {
[styles.PostList!]: true,
}}
>
<div class="Content Vertical" onScroll={handleScroll} ref={contentRef}>
<div
class="FieldContent Vertical"
onScroll={handleScroll}
ref={contentRef}
>
<For each={posts()?.posts}>
{(post) => (
<>
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/programs/Bluesky/PostThreadWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function BlueskyPostThreadWindow(p: {
[styles.PostList!]: true,
}}
>
<div class="Content Vertical">
<div class="FieldContent Vertical">
<Show when={parent()}>
<BlueskyPostView postView={parent()!} />
</Show>
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/programs/Bluesky/UserListWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export function BlueskyUserListWindow(p: {
}}
>
<div
class="Content Vertical"
class="FieldContent Vertical"
ref={contentRef}
onScroll={handleScroll}
>
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/programs/DiskDefragmenter/MainWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export function DiskDefragmenterMainWindow(p: { window: WindowState }) {
<>
<div class="Field">
<div
classList={{ Content: true, [styles.ClusterGrid!]: true }}
classList={{ FieldContent: true, [styles.ClusterGrid!]: true }}
ref={clusterGridRef}
>
<For each={clustersOnScreen()}>
Expand Down
6 changes: 3 additions & 3 deletions src/Wes95/programs/FileExplorer/MainWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
Show,
} from 'solid-js';
import { Combobox } from '../../components/Combobox';
import { ExplorerList } from '../../components/ExplorerList';
import { Icon } from '../../components/Icon';
import { ItemList } from '../../components/ItemList';
import { MenuBar } from '../../components/MenuBar';
import { FileSystemManager } from '../../lib/FileSystemManager';
import { WindowManager } from '../../lib/WindowManager';
Expand Down Expand Up @@ -297,11 +297,11 @@ export function FileExplorerMainWindow(p: {
>
<div
classList={{
Content: true,
FieldContent: true,
SmallSpacing: listType() !== 'details',
}}
>
<ItemList
<ExplorerList
appearance={listType()}
items={items()}
onSelect={chooseFile}
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/programs/QuickView/MainWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export function QuickViewMainWindow(p: {
Field: true,
}}
>
<div class="Content Vertical">
<div class="FieldContent Vertical">
<img src={url()} style={{ 'align-self': 'flex-start' }} />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/programs/WordPad/MainWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ export function WordPadMainWindow(p: {
</div>
</Show>
<div class="Field">
<div class="Content MediumSpacing Document" ref={contentRef}>
<div class="FieldContent MediumSpacing FieldDocument" ref={contentRef}>
<Markdown markdown={fileData()?.body} />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Wes95/system/About/MainWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function AboutWindow(p: { data: AboutData; window: WindowState }) {
</div>
<div class="Field">
<div
class="Content MediumSpacing"
class="FieldContent MediumSpacing"
style={{ 'white-space': 'pre-wrap' }}
>
{acknowledgements()}
Expand Down
6 changes: 3 additions & 3 deletions src/Wes95/system/FileSystem/OpenWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
Show,
} from 'solid-js';
import { Combobox } from '../../components/Combobox';
import { ExplorerList } from '../../components/ExplorerList';
import { Icon } from '../../components/Icon';
import { ItemList } from '../../components/ItemList';
import type { MenuItem } from '../../components/Menu';
import { FileSystemManager } from '../../lib/FileSystemManager';
import { WindowManager } from '../../lib/WindowManager';
Expand Down Expand Up @@ -164,8 +164,8 @@ export function FileSystemOpenWindow(p: {
</Show>
</div>
<div class="Field">
<div class="Content SmallSpacing">
<ItemList
<div class="FieldContent SmallSpacing">
<ExplorerList
appearance={listType()}
items={items()}
onSelect={chooseFile}
Expand Down
Loading