Skip to content

[codex] 修复系统信息进度条样式并放宽内置编辑器文件大小限制 #52

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
St0ff3l merged 1 commit into from
Jun 23, 2026
+53 −33
Merged

[codex] 修复系统信息进度条样式并放宽内置编辑器文件大小限制 #52

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/desktop/src/renderer/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function joinLocalPath(directoryPath: string, name: string) {
return `${normalized}${separator}${name}`
}

const TEXT_EDITOR_MAX_BYTES = 4 * 1024 * 1024
const TEXT_EDITOR_MAX_BYTES = 16 * 1024 * 1024
const LIKELY_BINARY_FILE_EXTENSIONS = new Set([
'.7z',
'.a',
Expand Down
16 changes: 10 additions & 6 deletions apps/desktop/src/renderer/features/system/SystemSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ export function SystemSidebar({
<Meter
label={t.cpu}
value={metrics?.cpuPercent ?? 0}
tone={getMetricTone(metrics?.cpuPercent ?? 0).replace('status-', '')}
tone={getMetricTone(metrics?.cpuPercent ?? 0)}
caption=""
percent={metrics ? `${metrics.cpuPercent}%` : '-'}
/>
<MemoryMeter metrics={metrics} />
<Meter
label={t.swap}
value={metrics?.swapPercent ?? 0}
tone={getMetricTone(metrics?.swapPercent ?? 0).replace('status-', '')}
tone={getMetricTone(metrics?.swapPercent ?? 0)}
caption={metrics?.swapUsage ?? '-'}
percent={metrics ? `${metrics.swapPercent}%` : '-'}
dotTone={getMetricTone(metrics?.swapPercent ?? 0)}
Expand Down Expand Up @@ -168,6 +168,9 @@ function MemoryMeter({ metrics }: { metrics?: SystemMetrics }) {
const cache = parseMemory(metrics?.memoryCacheUsage ?? '')
const kernel = parseMemory(metrics?.memoryKernelUsage ?? '')
const memoryTone = getMetricTone(metrics?.memoryPercent ?? 0)
// System meters intentionally use two color protocols:
// - tone-* for status/warning severity (cpu/swap and memory fallback)
// - app/cache/kernel for memory composition segments
const segments = total > 0
? [
{ key: 'app', label: t.app, value: metrics?.memoryAppUsage ?? '-', width: Math.max(0, Math.min(100, (app / total) * 100)) },
Expand All @@ -193,7 +196,7 @@ function MemoryMeter({ metrics }: { metrics?: SystemMetrics }) {
key={segment.key}
style={{ width: `${segment.width}%` }}
/>
)) : <i className="meter-fill orange" style={{ width: `${metrics?.memoryPercent ?? 0}%` }} />}
)) : <i className="meter-fill tone-warning" style={{ width: `${metrics?.memoryPercent ?? 0}%` }} />}

{segments.length ? (
<div className="memory-hover-popover">
Expand Down Expand Up @@ -287,9 +290,10 @@ function compactUptimeParts(parts: string[]) {
}

function getMetricTone(percent: number) {
if (percent >= 85) return 'status-red'
if (percent >= 60) return 'status-yellow'
return 'status-green'
// Status meters use the shared tone-* classes so dot/fill styling stays aligned.
if (percent >= 85) return 'tone-danger'
if (percent >= 60) return 'tone-warning'
return 'tone-success'
}

function ProcessTable({ rows }: { rows: SystemMetrics['topProcesses'] }) {
Expand Down
54 changes: 33 additions & 21 deletions apps/desktop/src/renderer/styles/themes/default-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,21 @@
background: var(--metric-kernel);
}

:root:not([data-theme]) .metric-dot.status-green,
:root[data-theme='default-dark'] .metric-dot.status-green,
:root[data-theme='default'] .metric-dot.status-green {
:root:not([data-theme]) .metric-dot.tone-success,
:root[data-theme='default-dark'] .metric-dot.tone-success,
:root[data-theme='default'] .metric-dot.tone-success {
background: var(--metric-status-green);
}

:root:not([data-theme]) .metric-dot.status-yellow,
:root[data-theme='default-dark'] .metric-dot.status-yellow,
:root[data-theme='default'] .metric-dot.status-yellow {
:root:not([data-theme]) .metric-dot.tone-warning,
:root[data-theme='default-dark'] .metric-dot.tone-warning,
:root[data-theme='default'] .metric-dot.tone-warning {
background: var(--metric-status-yellow);
}

:root:not([data-theme]) .metric-dot.status-red,
:root[data-theme='default-dark'] .metric-dot.status-red,
:root[data-theme='default'] .metric-dot.status-red {
:root:not([data-theme]) .metric-dot.tone-danger,
:root[data-theme='default-dark'] .metric-dot.tone-danger,
:root[data-theme='default'] .metric-dot.tone-danger {
background: var(--metric-status-red);
}

Expand All @@ -280,15 +280,15 @@
background: var(--meter-track);
}

:root:not([data-theme]) .meter-fill.green,
:root[data-theme='default-dark'] .meter-fill.green,
:root[data-theme='default'] .meter-fill.green {
:root:not([data-theme]) .meter-fill.tone-success,
:root[data-theme='default-dark'] .meter-fill.tone-success,
:root[data-theme='default'] .meter-fill.tone-success {
background: var(--success);
}

:root:not([data-theme]) .meter-fill.orange,
:root[data-theme='default-dark'] .meter-fill.orange,
:root[data-theme='default'] .meter-fill.orange {
:root:not([data-theme]) .meter-fill.tone-warning,
:root[data-theme='default-dark'] .meter-fill.tone-warning,
:root[data-theme='default'] .meter-fill.tone-warning {
background: var(--memory-warn);
}

Expand All @@ -298,6 +298,12 @@
background: var(--memory-warn);
}

:root:not([data-theme]) .meter-fill.tone-danger,
:root[data-theme='default-dark'] .meter-fill.tone-danger,
:root[data-theme='default'] .meter-fill.tone-danger {
background: var(--metric-status-red);
}

:root:not([data-theme]) .meter-fill.app,
:root[data-theme='default-dark'] .meter-fill.app,
:root[data-theme='default'] .meter-fill.app {
Expand Down Expand Up @@ -1693,21 +1699,27 @@
background: #3a3a3a;
}

:root:not([data-theme]) .meter-fill.green,
:root[data-theme='default-dark'] .meter-fill.green,
:root[data-theme='default'] .meter-fill.green {
:root:not([data-theme]) .meter-fill.tone-success,
:root[data-theme='default-dark'] .meter-fill.tone-success,
:root[data-theme='default'] .meter-fill.tone-success {
background: #39d98a;
}

:root:not([data-theme]) .meter-fill.orange,
:root[data-theme='default-dark'] .meter-fill.orange,
:root[data-theme='default'] .meter-fill.orange,
:root:not([data-theme]) .meter-fill.tone-warning,
:root[data-theme='default-dark'] .meter-fill.tone-warning,
:root[data-theme='default'] .meter-fill.tone-warning,
:root:not([data-theme]) .meter-fill.yellow,
:root[data-theme='default-dark'] .meter-fill.yellow,
:root[data-theme='default'] .meter-fill.yellow {
background: var(--memory-warn);
}

:root:not([data-theme]) .meter-fill.tone-danger,
:root[data-theme='default-dark'] .meter-fill.tone-danger,
:root[data-theme='default'] .meter-fill.tone-danger {
background: var(--metric-status-red);
}

:root:not([data-theme]) .mini-tabs span,
:root[data-theme='default-dark'] .mini-tabs span,
:root[data-theme='default'] .mini-tabs span {
Expand Down
14 changes: 9 additions & 5 deletions apps/desktop/src/renderer/styles/themes/default-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,15 @@
background: var(--metric-kernel);
}

:root[data-theme='default-light'] .metric-dot.status-green {
:root[data-theme='default-light'] .metric-dot.tone-success {
background: var(--metric-status-green);
}

:root[data-theme='default-light'] .metric-dot.status-yellow {
:root[data-theme='default-light'] .metric-dot.tone-warning {
background: var(--metric-status-yellow);
}

:root[data-theme='default-light'] .metric-dot.status-red {
:root[data-theme='default-light'] .metric-dot.tone-danger {
background: var(--metric-status-red);
}

Expand All @@ -339,15 +339,19 @@
background: var(--metric-kernel);
}

:root[data-theme='default-light'] .meter-fill.green {
:root[data-theme='default-light'] .meter-fill.tone-success {
background: var(--success);
}

:root[data-theme='default-light'] .meter-fill.yellow,
:root[data-theme='default-light'] .meter-fill.orange {
:root[data-theme='default-light'] .meter-fill.tone-warning {
background: var(--warning);
}

:root[data-theme='default-light'] .meter-fill.tone-danger {
background: var(--metric-status-red);
}

:root[data-theme='default-light'] .network-select {
border-color: var(--border-light);
background: #f7f8fa;
Expand Down
Loading