Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

refactor(editor): consolidate Details filter + toolbar buttons onto IconButton

esengine4deefec136e3
diff --git a/desktop/src/layout/Toolbar.tsx b/desktop/src/layout/Toolbar.tsx
index 0ace2e700..ab02372b5 100644
--- a/desktop/src/layout/Toolbar.tsx
+++ b/desktop/src/layout/Toolbar.tsx
@@ -22,6 +22,7 @@ import {
type LucideIcon,
} from 'lucide-react';
import { useEditorStore } from '@/store/editorStore';
+import { IconButton } from '@/components/IconButton';
import { ContextMenu } from '@/components/Menu';
import { EditorHistory } from '@/engine/EditorHistory';
import { commands, formatKeybinding } from '@/commands';
@@ -54,17 +55,9 @@ function TBtn({
onClick?: () => void;
}) {
return (
- <button
- type="button"
- className={`tbtn${active ? ' on' : ''}`}
- title={label}
- aria-label={label}
- aria-pressed={active}
- disabled={disabled}
- onClick={onClick}
- >
+ <IconButton size="lg" variant="ghost" active={active} disabled={disabled} title={label} onClick={onClick}>
<Icon size={16} strokeWidth={1.85} />
- </button>
+ </IconButton>
);
}
diff --git a/desktop/src/panels/Details.tsx b/desktop/src/panels/Details.tsx
index 9d150b451..6d6ca7d0a 100644
--- a/desktop/src/panels/Details.tsx
+++ b/desktop/src/panels/Details.tsx
@@ -62,6 +62,7 @@ import {
type MaterialContext,
} from '@/material/materialInspectorModel';
import { ColorControl, rgbaToHex8 } from '@/components/ColorControl';
+import { IconButton } from '@/components/IconButton';
import { ContextMenu } from '@/components/Menu';
import { NumField, useScrub, fmt, type ControlGesture } from '@/components/NumField';
import { Popover, usePopover } from '@/components/Popover';
@@ -1858,14 +1859,15 @@ function EditorDetails() {
<div className="insp">
<div className="phead insp-head">
<SearchField placeholder="Search" value={query} onChange={setQuery} />
- <button
- type="button"
- className={`filt-btn${filtOn ? ' on' : ''}`}
+ <IconButton
+ size="lg"
+ variant="outline"
+ active={filtOn}
title="Filter properties"
onClick={() => setFiltOn((v) => !v)}
>
<Filter size={14} strokeWidth={1.9} />
- </button>
+ </IconButton>
</div>
<div className="ent-head">
diff --git a/desktop/src/theme/chrome.css b/desktop/src/theme/chrome.css
index 035407b96..359c4e145 100644
--- a/desktop/src/theme/chrome.css
+++ b/desktop/src/theme/chrome.css
@@ -91,7 +91,6 @@
}
.tbtn:hover { color: var(--text); background: var(--srf-4); }
.tbtn:active { background: var(--srf-5); transform: translateY(0.5px); }
-.tbtn.on { color: var(--on-accent); background: var(--acc); }
.tbtn:disabled { opacity: 0.4; pointer-events: none; }
.tbtn .lbl { font-weight: 500; }
diff --git a/desktop/src/theme/inspector.css b/desktop/src/theme/inspector.css
index 68c6f5933..f79bcc2f9 100644
--- a/desktop/src/theme/inspector.css
+++ b/desktop/src/theme/inspector.css
@@ -20,10 +20,6 @@
font-weight: 600; font-size: var(--fs-xs); border-radius: var(--r-sm);
transition: background var(--t-fast); white-space: nowrap; }
.insp-add:hover { background: var(--star-dim); }
-.filt-btn { width: 28px; height: 26px; display: grid; place-items: center; color: var(--text-mute); border: 1px solid var(--border-line); border-radius: var(--r-sm); flex-shrink: 0; transition: color var(--t-fast), background var(--t-fast), border-color var(--t-fast); }
-.filt-btn:hover { color: var(--text); background: var(--srf-4); }
-.filt-btn:active { background: var(--srf-5); }
-.filt-btn.on { color: var(--warn); border-color: rgba(211,162,60,0.4); background: rgba(211,162,60,0.12); }
/* Add Component at the TOP of Details */
.insp-addrow { padding: 8px; border-bottom: 1px solid var(--border); }
.insp-addrow .insp-add { width: 100%; height: 30px; justify-content: center; }