Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

feat(cursor): option to always render the arrow cursor

EtienneLescote98b6a5147e7
diff --git a/electron/ai-edition/style-preset-service.test.ts b/electron/ai-edition/style-preset-service.test.ts
index d98b3d03a..cb486737f 100644
--- a/electron/ai-edition/style-preset-service.test.ts
+++ b/electron/ai-edition/style-preset-service.test.ts
@@ -32,6 +32,7 @@ const APPEARANCE: StylePresetAppearance = {
motionBlur: 0.35,
clickBounce: 2.5,
model3d: false,
+ alwaysArrow: false,
},
cursorShow: true,
cursorAutoHide: false,
diff --git a/electron/ipc/nativeBridge.presets.test.ts b/electron/ipc/nativeBridge.presets.test.ts
index 9fa094f8d..1d5d63ccb 100644
--- a/electron/ipc/nativeBridge.presets.test.ts
+++ b/electron/ipc/nativeBridge.presets.test.ts
@@ -52,6 +52,7 @@ const APPEARANCE: StylePresetAppearance = {
motionBlur: 0.35,
clickBounce: 2.5,
model3d: false,
+ alwaysArrow: false,
},
cursorShow: true,
cursorAutoHide: false,
diff --git a/electron/native-bridge/services/compositorViewService.test.ts b/electron/native-bridge/services/compositorViewService.test.ts
index 967fe6920..f479912be 100644
--- a/electron/native-bridge/services/compositorViewService.test.ts
+++ b/electron/native-bridge/services/compositorViewService.test.ts
@@ -456,6 +456,17 @@ describe("resolveSceneAssetPaths", () => {
expect(Object.keys(sprites).sort()).toEqual(Object.keys(DEFAULT_CURSOR_SPRITES).sort());
});
+ it("draws every cursor state with the arrow when alwaysArrow is on", () => {
+ const sprites = resolved({ cursor: { theme: "default", alwaysArrow: true } }).cursor
+ .cursorSprites;
+
+ expect(Object.keys(sprites).sort()).toEqual(Object.keys(DEFAULT_CURSOR_SPRITES).sort());
+ for (const [type, sprite] of Object.entries<ResolvedSprite>(sprites)) {
+ expect(sprite, type).toEqual(sprites.arrow);
+ }
+ expect(sprites.arrow.path).toBe(path.join(resources, "cursors", "default", "arrow.png"));
+ });
+
it("carries each sprite's hotspot as a fraction of its own image", () => {
const sprites = resolved({ cursor: { theme: "default" } }).cursor.cursorSprites;
diff --git a/electron/native-bridge/services/compositorViewService.ts b/electron/native-bridge/services/compositorViewService.ts
index 2adceb62a..5875b9780 100644
--- a/electron/native-bridge/services/compositorViewService.ts
+++ b/electron/native-bridge/services/compositorViewService.ts
@@ -101,9 +101,10 @@ export function resolveSceneAssetPath(relativePath: string): string | null {
*/
function resolveCursorSpritePaths(
themeId: string,
+ alwaysArrow: boolean,
): Record<string, { path: string; hotspotX: number; hotspotY: number }> {
const resolved: Record<string, { path: string; hotspotX: number; hotspotY: number }> = {};
- for (const [type, sprite] of Object.entries(resolveCursorSprites(themeId))) {
+ for (const [type, sprite] of Object.entries(resolveCursorSprites(themeId, alwaysArrow))) {
const absolute = resolveSceneAssetPath(sprite.assetPath);
if (absolute) {
resolved[type] = {
@@ -127,6 +128,7 @@ export function resolveSceneAssetPaths(sceneJson: string): string {
background?: { kind?: string; path?: string };
cursor?: {
theme?: string;
+ alwaysArrow?: boolean;
cursorSprites?: Record<string, { path: string; hotspotX: number; hotspotY: number }>;
};
webcamEffect?: {
@@ -159,7 +161,10 @@ export function resolveSceneAssetPaths(sceneJson: string): string {
changed = resolveBackgroundImage(scene.background) || changed;
changed = resolveBackgroundImage(scene.webcamEffect?.background) || changed;
if (scene.cursor && typeof scene.cursor.theme === "string") {
- scene.cursor.cursorSprites = resolveCursorSpritePaths(scene.cursor.theme);
+ scene.cursor.cursorSprites = resolveCursorSpritePaths(
+ scene.cursor.theme,
+ scene.cursor.alwaysArrow === true,
+ );
changed = true;
}
// The scene asks for an effect; this process says where the model is. A model that
diff --git a/src/components/ai-edition/RightPanes.tsx b/src/components/ai-edition/RightPanes.tsx
index b3f27f15c..b23919cc8 100644
--- a/src/components/ai-edition/RightPanes.tsx
+++ b/src/components/ai-edition/RightPanes.tsx
@@ -3783,6 +3783,18 @@ export function CursorPane() {
}}
/>
</div>
+ <div className={styles.paneRow}>
+ <span className={styles.label}>
+ {ts("cursor.alwaysArrow")}
+ <span className={styles.info}>{ts("cursor.alwaysArrowHint")}</span>
+ </span>
+ <Toggle
+ ariaLabel={ts("cursor.alwaysArrow")}
+ checked={settings.cursor.alwaysArrow}
+ disabled={!hasDocument || !settings.cursorShow}
+ onChange={(v) => void set({ cursor: { alwaysArrow: v } })}
+ />
+ </div>
<div className={styles.sectionLabel}>{ts("cursor.theme")}</div>
<div className={styles.cursorGrid}>
{cursorThemeOptions.map((option) => {
diff --git a/src/components/video-editor/editorDefaults.ts b/src/components/video-editor/editorDefaults.ts
index 2830710a6..dba8525dd 100644
--- a/src/components/video-editor/editorDefaults.ts
+++ b/src/components/video-editor/editorDefaults.ts
@@ -80,6 +80,7 @@ export const DEFAULT_CURSOR_SETTINGS: CursorVisualSettings & { show: boolean; th
motionBlur: DEFAULT_CURSOR_MOTION_BLUR,
clickBounce: DEFAULT_CURSOR_CLICK_BOUNCE,
model3d: DEFAULT_CURSOR_MODEL3D,
+ alwaysArrow: false,
theme: DEFAULT_CURSOR_THEME_ID,
};
diff --git a/src/components/video-editor/projectPersistence.ts b/src/components/video-editor/projectPersistence.ts
index 43d863d65..9b7e4bc0a 100644
--- a/src/components/video-editor/projectPersistence.ts
+++ b/src/components/video-editor/projectPersistence.ts
@@ -108,6 +108,7 @@ export interface ProjectEditorState {
cursorSmoothing?: number;
cursorMotionBlur?: number;
cursorClickBounce?: number;
+ cursorAlwaysArrow?: boolean;
}
export interface EditorProjectData {
@@ -496,6 +497,9 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
...(isFiniteNumber(editor.cursorClickBounce)
? { cursorClickBounce: editor.cursorClickBounce }
: {}),
+ ...(typeof editor.cursorAlwaysArrow === "boolean"
+ ? { cursorAlwaysArrow: editor.cursorAlwaysArrow }
+ : {}),
wallpaper:
typeof editor.wallpaper === "string"
? normalizeWallpaperValue(editor.wallpaper)
diff --git a/src/components/video-editor/types.ts b/src/components/video-editor/types.ts
index e6273d18c..d2ac07008 100644
--- a/src/components/video-editor/types.ts
+++ b/src/components/video-editor/types.ts
@@ -275,6 +275,8 @@ export interface CursorVisualSettings {
* each click; pointing shapes also lean towards their motion. Other themes stay flat sprites.
*/
model3d: boolean;
+ /** Draws every cursor state (text, hand, resize…) with the theme's arrow sprite. */
+ alwaysArrow: boolean;
autoHide?: boolean;
}
diff --git a/src/i18n/locales/ar/settings.json b/src/i18n/locales/ar/settings.json
index 59b3d79ab..bed175662 100644
--- a/src/i18n/locales/ar/settings.json
+++ b/src/i18n/locales/ar/settings.json
@@ -421,6 +421,8 @@
"title": "المؤشر",
"show": "إظهار المؤشر",
"themeDefault": "افتراضي",
+ "alwaysArrow": "استخدام السهم دائمًا",
+ "alwaysArrowHint": "يعرض السهم لكل حالات المؤشر، حتى فوق النص أو الروابط.",
"motionBlur": "ضبابية الحركة",
"theme": "نمط المؤشر",
"autoHide": "إخفاء عند عدم النشاط"
diff --git a/src/i18n/locales/cs/settings.json b/src/i18n/locales/cs/settings.json
index a109b471f..7a07edc18 100644
--- a/src/i18n/locales/cs/settings.json
+++ b/src/i18n/locales/cs/settings.json
@@ -421,6 +421,8 @@
"title": "Kurzor",
"show": "Zobrazit kurzor",
"themeDefault": "Výchozí",
+ "alwaysArrow": "Vždy používat kurzor šipky",
+ "alwaysArrowHint": "Zobrazí šipku pro každý stav kurzoru, i nad textem nebo odkazy.",
"motionBlur": "Pohybové rozmazání",
"theme": "Styl kurzoru",
"autoHide": "Automaticky skrýt, když je neaktivní"
diff --git a/src/i18n/locales/de/settings.json b/src/i18n/locales/de/settings.json
index e8c7d61c4..019dc03f4 100644
--- a/src/i18n/locales/de/settings.json
+++ b/src/i18n/locales/de/settings.json
@@ -421,6 +421,8 @@
"title": "Cursor",
"show": "Cursor anzeigen",
"themeDefault": "Standard",
+ "alwaysArrow": "Immer Pfeil-Cursor verwenden",
+ "alwaysArrowHint": "Zeigt den Pfeil für jeden Cursor-Zustand, auch über Text oder Links.",
"motionBlur": "Bewegungsunschärfe",
"theme": "Cursor-Stil",
"autoHide": "Bei Inaktivität ausblenden"
diff --git a/src/i18n/locales/en/settings.json b/src/i18n/locales/en/settings.json
index f2eedf4e2..89804b53b 100644
--- a/src/i18n/locales/en/settings.json
+++ b/src/i18n/locales/en/settings.json
@@ -421,6 +421,8 @@
"title": "Cursor",
"show": "Show cursor",
"themeDefault": "Default",
+ "alwaysArrow": "Always use arrow cursor",
+ "alwaysArrowHint": "Shows the arrow for every cursor state, even over text or links.",
"motionBlur": "Motion blur",
"theme": "Cursor style",
"autoHide": "Auto-hide when inactive"
diff --git a/src/i18n/locales/es/settings.json b/src/i18n/locales/es/settings.json
index b424437e2..3434312dd 100644
--- a/src/i18n/locales/es/settings.json
+++ b/src/i18n/locales/es/settings.json
@@ -421,6 +421,8 @@
"title": "Cursor",
"show": "Mostrar cursor",
"themeDefault": "Predeterminado",
+ "alwaysArrow": "Usar siempre el cursor de flecha",
+ "alwaysArrowHint": "Muestra la flecha en todos los estados del cursor, incluso sobre texto o enlaces.",
"motionBlur": "Desenfoque de movimiento",
"theme": "Estilo del cursor",
"autoHide": "Ocultar si está inactivo"
diff --git a/src/i18n/locales/fr/settings.json b/src/i18n/locales/fr/settings.json
index ed2060bc7..89c5ab615 100644
--- a/src/i18n/locales/fr/settings.json
+++ b/src/i18n/locales/fr/settings.json
@@ -421,6 +421,8 @@
"title": "Curseur",
"show": "Afficher le curseur",
"themeDefault": "Par défaut",
+ "alwaysArrow": "Toujours utiliser la flèche",
+ "alwaysArrowHint": "Affiche la flèche pour tous les états du curseur, même sur du texte ou des liens.",
"motionBlur": "Flou de mouvement",
"theme": "Style du curseur",
"autoHide": "Masquer si inactif"
diff --git a/src/i18n/locales/it/settings.json b/src/i18n/locales/it/settings.json
index 4c8f21df5..94046d278 100644
--- a/src/i18n/locales/it/settings.json
+++ b/src/i18n/locales/it/settings.json
@@ -421,6 +421,8 @@
"title": "Cursore",
"show": "Mostra cursore",
"themeDefault": "Predefinito",
+ "alwaysArrow": "Usa sempre il cursore a freccia",
+ "alwaysArrowHint": "Mostra la freccia per ogni stato del cursore, anche sopra testo o link.",
"motionBlur": "Sfocatura movimento",
"theme": "Stile del cursore",
"autoHide": "Nascondi se inattivo"
diff --git a/src/i18n/locales/ja-JP/settings.json b/src/i18n/locales/ja-JP/settings.json
index 1e3260d59..15c38efbb 100644
--- a/src/i18n/locales/ja-JP/settings.json
+++ b/src/i18n/locales/ja-JP/settings.json
@@ -421,6 +421,8 @@
"title": "カーソル",
"show": "カーソルを表示",
"themeDefault": "デフォルト",
+ "alwaysArrow": "常に矢印カーソルを使用",
+ "alwaysArrowHint": "テキストやリンクの上でも、すべてのカーソル状態で矢印を表示します。",
"motionBlur": "モーションブラー",
"theme": "カーソルのスタイル",
"autoHide": "非アクティブ時に非表示"
diff --git a/src/i18n/locales/ko-KR/settings.json b/src/i18n/locales/ko-KR/settings.json
index 33cc0af6f..23df69303 100644
--- a/src/i18n/locales/ko-KR/settings.json
+++ b/src/i18n/locales/ko-KR/settings.json
@@ -421,6 +421,8 @@
"title": "커서",
"show": "커서 표시",
"themeDefault": "기본",
+ "alwaysArrow": "항상 화살표 커서 사용",
+ "alwaysArrowHint": "텍스트나 링크 위에서도 모든 커서 상태에 화살표를 표시합니다.",
"motionBlur": "모션 블러",
"theme": "커서 스타일",
"autoHide": "비활성 시 자동 숨김"
diff --git a/src/i18n/locales/pt-BR/settings.json b/src/i18n/locales/pt-BR/settings.json
index 807149743..6d3cae2d2 100644
--- a/src/i18n/locales/pt-BR/settings.json
+++ b/src/i18n/locales/pt-BR/settings.json
@@ -421,6 +421,8 @@
"title": "Cursor",
"show": "Mostrar cursor",
"themeDefault": "Padrão",
+ "alwaysArrow": "Sempre usar o cursor de seta",
+ "alwaysArrowHint": "Mostra a seta em todos os estados do cursor, mesmo sobre texto ou links.",
"motionBlur": "Desfoque de movimento",
"theme": "Estilo do cursor",
"autoHide": "Ocultar quando inativo"
diff --git a/src/i18n/locales/ru/settings.json b/src/i18n/locales/ru/settings.json
index 510ef1202..a90bcc22b 100644
--- a/src/i18n/locales/ru/settings.json
+++ b/src/i18n/locales/ru/settings.json
@@ -421,6 +421,8 @@
"title": "Курсор",
"show": "Показывать курсор",
"themeDefault": "По умолчанию",
+ "alwaysArrow": "Всегда использовать стрелку",
+ "alwaysArrowHint": "Показывает стрелку для любого состояния курсора, даже над текстом или ссылками.",
"motionBlur": "Размытие движения",
"theme": "Стиль курсора",
"autoHide": "Скрывать при неактивности"
diff --git a/src/i18n/locales/tr/settings.json b/src/i18n/locales/tr/settings.json
index 9929d69de..ce2d59373 100644
--- a/src/i18n/locales/tr/settings.json
+++ b/src/i18n/locales/tr/settings.json
@@ -421,6 +421,8 @@
"title": "İmleç",
"show": "İmleci Göster",
"themeDefault": "Varsayılan",
+ "alwaysArrow": "Her zaman ok imlecini kullan",
+ "alwaysArrowHint": "Metin veya bağlantı üzerinde bile her imleç durumu için oku gösterir.",
"motionBlur": "Hareket Bulanıklığı",
"theme": "İmleç Stili",
"autoHide": "Hareketsizken gizle"
diff --git a/src/i18n/locales/vi/settings.json b/src/i18n/locales/vi/settings.json
index 4b2a21dfb..2b004b764 100644
--- a/src/i18n/locales/vi/settings.json
+++ b/src/i18n/locales/vi/settings.json
@@ -421,6 +421,8 @@
"title": "Con trỏ",
"show": "Hiện con trỏ",
"themeDefault": "Mặc định",
+ "alwaysArrow": "Luôn dùng con trỏ mũi tên",
+ "alwaysArrowHint": "Hiển thị mũi tên cho mọi trạng thái con trỏ, kể cả trên văn bản hoặc liên kết.",
"motionBlur": "Làm mờ chuyển động",
"theme": "Kiểu con trỏ",
"autoHide": "Ẩn khi không hoạt động"
diff --git a/src/i18n/locales/zh-CN/settings.json b/src/i18n/locales/zh-CN/settings.json
index 08248ede3..cbdf536e4 100644
--- a/src/i18n/locales/zh-CN/settings.json
+++ b/src/i18n/locales/zh-CN/settings.json
@@ -421,6 +421,8 @@
"title": "光标",
"show": "显示光标",
"themeDefault": "默认",
+ "alwaysArrow": "始终使用箭头光标",
+ "alwaysArrowHint": "在任何光标状态下都显示箭头,即使位于文本或链接上方。",
"motionBlur": "运动模糊",
"theme": "光标样式",
"autoHide": "闲置时隐藏"
diff --git a/src/i18n/locales/zh-TW/settings.json b/src/i18n/locales/zh-TW/settings.json
index bceeab38d..fc8173600 100644
--- a/src/i18n/locales/zh-TW/settings.json
+++ b/src/i18n/locales/zh-TW/settings.json
@@ -421,6 +421,8 @@
"title": "游標",
"show": "顯示游標",
"themeDefault": "預設",
+ "alwaysArrow": "一律使用箭頭游標",
+ "alwaysArrowHint": "在任何游標狀態下都顯示箭頭,即使位於文字或連結上方。",
"motionBlur": "動態模糊",
"theme": "游標樣式",
"autoHide": "閒置時隱藏"
diff --git a/src/lib/ai-edition/store/editorSettings.ts b/src/lib/ai-edition/store/editorSettings.ts
index ed3342256..f9262855b 100644
--- a/src/lib/ai-edition/store/editorSettings.ts
+++ b/src/lib/ai-edition/store/editorSettings.ts
@@ -173,6 +173,7 @@ interface LegacyShape {
cursorMotionBlur?: number;
cursorClickBounce?: number;
cursorModel3d?: boolean;
+ cursorAlwaysArrow?: boolean;
cursorShow?: boolean;
cursorAutoHide?: boolean;
cursorTheme?: string;
@@ -207,6 +208,7 @@ export function getEditorSettings(doc: AxcutDocument | null | undefined): Editor
clickBounce: num(legacy?.cursorClickBounce, DEFAULT_EDITOR_SETTINGS.cursor.clickBounce),
// Absent in every project saved before the setting existed: those keep the flat cursor.
model3d: bool(legacy?.cursorModel3d, DEFAULT_EDITOR_SETTINGS.cursor.model3d),
+ alwaysArrow: bool(legacy?.cursorAlwaysArrow, DEFAULT_EDITOR_SETTINGS.cursor.alwaysArrow),
autoHide: bool(legacy?.cursorAutoHide, DEFAULT_EDITOR_SETTINGS.cursorAutoHide),
};
@@ -336,6 +338,7 @@ function nextLegacy(current: LegacyShape | null, patch: EditorSettingsPatch): Le
if (c.motionBlur !== undefined) next.cursorMotionBlur = c.motionBlur;
if (c.clickBounce !== undefined) next.cursorClickBounce = c.clickBounce;
if (c.model3d !== undefined) next.cursorModel3d = c.model3d;
+ if (c.alwaysArrow !== undefined) next.cursorAlwaysArrow = c.alwaysArrow;
if (c.theme !== undefined) next.cursorTheme = c.theme;
if (c.show !== undefined) next.cursorShow = c.show;
if (c.autoHide !== undefined) next.cursorAutoHide = c.autoHide;
diff --git a/src/lib/ai-edition/stylePresets.test.ts b/src/lib/ai-edition/stylePresets.test.ts
index 8e948218e..ed99c8693 100644
--- a/src/lib/ai-edition/stylePresets.test.ts
+++ b/src/lib/ai-edition/stylePresets.test.ts
@@ -40,6 +40,7 @@ function appearance(overrides: Partial<StylePresetAppearance> = {}): StylePreset
motionBlur: 0.35,
clickBounce: 2.5,
model3d: false,
+ alwaysArrow: false,
},
cursorShow: true,
cursorAutoHide: false,
diff --git a/src/lib/ai-edition/stylePresets.ts b/src/lib/ai-edition/stylePresets.ts
index 6fdd1e92f..59408f8b4 100644
--- a/src/lib/ai-edition/stylePresets.ts
+++ b/src/lib/ai-edition/stylePresets.ts
@@ -316,6 +316,9 @@ export function parseStylePresetAppearance(value: unknown): StylePresetAppearanc
clickBounce: readNumber(cursor, "clickBounce", CURSOR_NUMBER_RANGES.clickBounce, "cursor."),
// Presets written before the 3D cursor existed meant the flat one.
model3d: cursor.model3d === undefined ? false : readBoolean(cursor, "model3d", "cursor."),
+ // Presets written before the option existed kept every cursor state.
+ alwaysArrow:
+ cursor.alwaysArrow === undefined ? false : readBoolean(cursor, "alwaysArrow", "cursor."),
},
cursorShow: readBoolean(value, "cursorShow"),
cursorAutoHide: readBoolean(value, "cursorAutoHide"),
diff --git a/src/lib/ai-edition/stylePresetsEditor.test.ts b/src/lib/ai-edition/stylePresetsEditor.test.ts
index b63dcd769..05c5987bd 100644
--- a/src/lib/ai-edition/stylePresetsEditor.test.ts
+++ b/src/lib/ai-edition/stylePresetsEditor.test.ts
@@ -50,6 +50,7 @@ function styledSettings(): EditorSettingsSnapshot {
motionBlur: 0.9,
clickBounce: 4,
model3d: true,
+ alwaysArrow: false,
},
cursorShow: false,
cursorAutoHide: true,
diff --git a/src/lib/ai-edition/stylePresetsEditor.ts b/src/lib/ai-edition/stylePresetsEditor.ts
index cb8565e46..3b8c69204 100644
--- a/src/lib/ai-edition/stylePresetsEditor.ts
+++ b/src/lib/ai-edition/stylePresetsEditor.ts
@@ -40,6 +40,7 @@ export function stylePresetAppearanceFromSettings(
motionBlur: settings.cursor.motionBlur,
clickBounce: settings.cursor.clickBounce,
model3d: settings.cursor.model3d,
+ alwaysArrow: settings.cursor.alwaysArrow,
},
cursorShow: settings.cursorShow,
cursorAutoHide: settings.cursorAutoHide,
diff --git a/src/lib/cursor/cursorThemes.ts b/src/lib/cursor/cursorThemes.ts
index 85e50f040..c23d28686 100644
--- a/src/lib/cursor/cursorThemes.ts
+++ b/src/lib/cursor/cursorThemes.ts
@@ -507,14 +507,10 @@ export function normalizeCursorThemeId(id: unknown): string {
*/
export function resolveCursorSprites(
themeId: string | null | undefined,
+ alwaysArrow = false,
): Record<NativeCursorType, CursorSprite> {
- const theme = getCursorTheme(themeId);
- if (!theme) {
- return DEFAULT_CURSOR_SPRITES;
- }
-
const sprites = { ...DEFAULT_CURSOR_SPRITES };
- for (const [type, asset] of Object.entries(theme.assets)) {
+ for (const [type, asset] of Object.entries(getCursorTheme(themeId)?.assets ?? {})) {
if (asset.width <= 0 || asset.height <= 0) {
continue;
}
@@ -526,5 +522,12 @@ export function resolveCursorSprites(
hotspotY: asset.hotspotY / asset.height,
};
}
+ // "Always use arrow": one consistent pointer for the whole recording, the I-beam and the
+ // hand included. Done on the table the compositor reads, so it needs no mode of its own.
+ if (alwaysArrow) {
+ for (const type of Object.keys(sprites) as NativeCursorType[]) {
+ sprites[type] = sprites.arrow;
+ }
+ }
return sprites;
}
diff --git a/src/lib/projectDefaults.ts b/src/lib/projectDefaults.ts
index 6ac1e1172..c973b2be8 100644
--- a/src/lib/projectDefaults.ts
+++ b/src/lib/projectDefaults.ts
@@ -194,6 +194,7 @@ export interface ProjectAppearanceDefaults {
motionBlur: number;
clickBounce: number;
model3d: boolean;
+ alwaysArrow: boolean;
autoHide: boolean;
};
cursorShow: boolean;
@@ -234,6 +235,7 @@ export const DEFAULT_PROJECT_APPEARANCE: ProjectAppearanceDefaults = {
motionBlur: 0.35,
clickBounce: 2.5,
model3d: false,
+ alwaysArrow: false,
autoHide: false,
},
cursorShow: true,
diff --git a/src/native/browserShim.presets.test.ts b/src/native/browserShim.presets.test.ts
index f993fde01..f2be5bddf 100644
--- a/src/native/browserShim.presets.test.ts
+++ b/src/native/browserShim.presets.test.ts
@@ -36,6 +36,7 @@ const APPEARANCE: StylePresetAppearance = {
motionBlur: 0.35,
clickBounce: 2.5,
model3d: false,
+ alwaysArrow: false,
},
cursorShow: true,
cursorAutoHide: false,
diff --git a/src/native/sceneDescription.test.ts b/src/native/sceneDescription.test.ts
index 0f4377de0..a71d3bb2f 100644
--- a/src/native/sceneDescription.test.ts
+++ b/src/native/sceneDescription.test.ts
@@ -1119,6 +1119,7 @@ describe("buildSceneDescription.settings mapping", () => {
cursorMotionBlur: 0.5,
cursorClickBounce: 1.5,
cursorClipToBounds: true,
+ cursorAlwaysArrow: true,
},
});
const cursor = buildSceneDescription(doc).cursor;
@@ -1128,6 +1129,7 @@ describe("buildSceneDescription.settings mapping", () => {
expect(cursor.clickBounce).toBe(1.5);
// The option is gone: a project that had it on now overflows like every other one.
expect(cursor.clipToBounds).toBe(false);
+ expect(cursor.alwaysArrow).toBe(true);
});
it("maps show / theme / shape / mirror through to layout+cursor", () => {
diff --git a/src/native/sceneDescription.ts b/src/native/sceneDescription.ts
index 27a7ba7bb..a3d8cf816 100644
--- a/src/native/sceneDescription.ts
+++ b/src/native/sceneDescription.ts
@@ -414,6 +414,8 @@ export interface SceneCursor {
* the default theme's arrow; any other cursor keeps its flat sprite.
*/
model3d: boolean;
+ /** Every cursor state drawn with the arrow sprite (resolved app-side, see compositorViewService). */
+ alwaysArrow: boolean;
clipToBounds: boolean;
/** Cursor theme id (sprite set). */
theme: string;
@@ -1107,6 +1109,7 @@ export function buildSceneDescription(
motionBlur: settings.cursor.motionBlur,
clickBounce: settings.cursor.clickBounce,
model3d: settings.cursor.model3d,
+ alwaysArrow: settings.cursor.alwaysArrow,
// The "Keep inside frame" option is gone: the cursor always overflows into the
// background. The field stays because the compositor's scene requires it.
clipToBounds: false,