Skip to content

fix: duplicate shortcut #963

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
ameer2468 merged 1 commit into from
Aug 27, 2025
Merged

fix: duplicate shortcut #963

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
9 changes: 1 addition & 8 deletions apps/desktop/src/routes/editor/AspectRatioSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Select as KSelect } from "@kobalte/core/select";
import { createEventListener } from "@solid-primitives/event-listener";
import { createSignal, Show } from "solid-js";
import Tooltip from "~/components/Tooltip";
import type { AspectRatio } from "~/utils/tauri";
Expand All @@ -17,15 +16,9 @@ function AspectRatioSelect() {
const { project, setProject } = useEditorContext();
const [open, setOpen] = createSignal(false);
let triggerSelect: HTMLDivElement | undefined;
createEventListener(document, "keydown", (e: KeyboardEvent) => {
if (e.code === "KeyA" && e.target === document.body) {
e.preventDefault();
setOpen((prev) => !prev);
}
});

return (
<Tooltip kbd={["A"]} content="Aspect Ratio">
<Tooltip content="Aspect Ratio">
<KSelect<AspectRatio | "auto">
open={open()}
onOpenChange={setOpen}
Expand Down
4 changes: 1 addition & 3 deletions apps/desktop/src/routes/editor/Player.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ export function Player() {
editorState.playbackTime,
),
},
{ combo: "C", handler: () => cropDialogHandler() },
{
combo: "Space",
handler: async () => {
Expand All @@ -198,7 +197,6 @@ export function Player() {
<AspectRatioSelect />
<EditorButton
tooltipText="Crop Video"
kbd={["C"]}
onClick={() => cropDialogHandler()}
leftIcon={<IconCapCrop class="w-5 text-gray-12" />}
>
Expand Down Expand Up @@ -258,7 +256,7 @@ export function Player() {
<div class="flex flex-row flex-1 gap-4 justify-end items-center">
<div class="flex-1" />
<EditorButton<typeof KToggleButton>
tooltipText="Split"
tooltipText="Toggle Split"
kbd={["S"]}
pressed={editorState.timeline.interactMode === "split"}
onChange={(v: boolean) =>
Expand Down
Loading