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.

fix: timeline horizontal scroll and frame debugger click in live mode

esengineece2c5acb533
diff --git a/editor/src/panels/frameDebugger/FrameDebuggerPanel.ts b/editor/src/panels/frameDebugger/FrameDebuggerPanel.ts
index 1df9792d3..0350a220f 100644
--- a/editor/src/panels/frameDebugger/FrameDebuggerPanel.ts
+++ b/editor/src/panels/frameDebugger/FrameDebuggerPanel.ts
@@ -126,6 +126,20 @@ export class FrameDebuggerPanel implements PanelInstance {
this.btnToggle_.addEventListener('click', () => this.toggleMode_());
this.btnPrev_.addEventListener('click', () => this.stepDrawCall_(-1));
this.btnNext_.addEventListener('click', () => this.stepDrawCall_(1));
+
+ this.listEl_.addEventListener('mousedown', (e) => {
+ const item = (e.target as HTMLElement).closest('.es-fd-item') as HTMLElement | null;
+ if (!item) return;
+ const idx = parseInt(item.dataset.index!, 10);
+ if (!isNaN(idx)) this.selectDrawCall_(idx);
+ });
+
+ this.pipelineEl_.addEventListener('mousedown', (e) => {
+ const bar = (e.target as HTMLElement).closest('.es-fd-pipe-bar') as HTMLElement | null;
+ if (!bar) return;
+ const idx = parseInt(bar.dataset.index!, 10);
+ if (!isNaN(idx)) this.selectDrawCall_(idx);
+ });
}
private async startListening_(): Promise<void> {
@@ -227,12 +241,6 @@ export class FrameDebuggerPanel implements PanelInstance {
}
this.pipelineEl_.innerHTML = html;
- this.pipelineEl_.querySelectorAll('.es-fd-pipe-bar').forEach(el => {
- el.addEventListener('click', () => {
- const idx = parseInt((el as HTMLElement).dataset.index!, 10);
- this.selectDrawCall_(idx);
- });
- });
}
private selectDrawCall_(index: number): void {
@@ -288,12 +296,6 @@ export class FrameDebuggerPanel implements PanelInstance {
}
this.listEl_.innerHTML = html;
- this.listEl_.querySelectorAll('.es-fd-item').forEach(el => {
- el.addEventListener('click', () => {
- const idx = parseInt((el as HTMLElement).dataset.index!, 10);
- this.selectDrawCall_(idx);
- });
- });
}
private renderDetail_(): void {
@@ -302,7 +304,13 @@ export class FrameDebuggerPanel implements PanelInstance {
return;
}
- const dc: DrawCallInfo = this.captureData_.drawCalls[this.selectedIndex_];
+ const dc: DrawCallInfo | undefined = this.captureData_.drawCalls.find(
+ d => d.index === this.selectedIndex_,
+ ) ?? this.captureData_.drawCalls[this.selectedIndex_];
+ if (!dc) {
+ this.detailEl_.innerHTML = '<div class="es-fd-empty">Draw call not found</div>';
+ return;
+ }
const rows = [
['Stage', STAGE_NAMES[dc.stage] ?? dc.stage],
['Type', TYPE_LABELS[dc.type] ?? dc.type],
diff --git a/editor/src/panels/timeline/TimelineKeyframeArea.ts b/editor/src/panels/timeline/TimelineKeyframeArea.ts
index f51b59934..805df5017 100644
--- a/editor/src/panels/timeline/TimelineKeyframeArea.ts
+++ b/editor/src/panels/timeline/TimelineKeyframeArea.ts
@@ -845,6 +845,12 @@ export class TimelineKeyframeArea {
}
private onMouseDown(e: MouseEvent): void {
+ if (e.button === 1) {
+ e.preventDefault();
+ this.startMiddleButtonPan(e);
+ return;
+ }
+
const rect = this.canvas_.getBoundingClientRect();
const x = e.clientX - rect.left;
const y = e.clientY - rect.top;
@@ -1555,6 +1561,22 @@ export class TimelineKeyframeArea {
document.addEventListener('mouseup', onUp);
}
+ private startMiddleButtonPan(e: MouseEvent): void {
+ let lastX = e.clientX;
+ const onMove = (ev: MouseEvent) => {
+ const dx = ev.clientX - lastX;
+ lastX = ev.clientX;
+ this.state_.scrollX = Math.max(0, this.state_.scrollX - dx);
+ this.state_.notify();
+ };
+ const onUp = () => {
+ document.removeEventListener('mousemove', onMove);
+ document.removeEventListener('mouseup', onUp);
+ };
+ document.addEventListener('mousemove', onMove);
+ document.addEventListener('mouseup', onUp);
+ }
+
private onWheel(e: WheelEvent): void {
e.preventDefault();
if (e.ctrlKey || e.metaKey) {
@@ -1562,7 +1584,9 @@ export class TimelineKeyframeArea {
const pivotX = e.clientX - rect.left;
this.state_.zoom(-e.deltaY, pivotX);
} else {
- this.state_.scrollX = Math.max(0, this.state_.scrollX + e.deltaX);
+ const dx = e.shiftKey ? e.deltaY : e.deltaX;
+ const scrollDelta = dx !== 0 ? dx : e.deltaY;
+ this.state_.scrollX = Math.max(0, this.state_.scrollX + scrollDelta);
this.state_.notify();
}
}