Skip to content

Fix Alt clipping cursor in Layers panel (desktop) #3780

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

Open
JustJ01 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Alt clipping cursor in Layers panel (desktop) #3780

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5d685f
fixed alt-click clipping
JustJ01 Feb 17, 2026
5f6d829
Merge branch 'master' into fix-cursor-icon-clipping-mask
JustJ01 Feb 17, 2026
fa42ec0
Merge branch 'master' into fix-cursor-icon-clipping-mask
JustJ01 Feb 17, 2026
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
14 changes: 10 additions & 4 deletions frontend/src/components/panels/Layers.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import type { NodeGraphState } from "@graphite/state-providers/node-graph";
import type { TooltipState } from "@graphite/state-providers/tooltip";
import { pasteFile } from "@graphite/utility-functions/files";
import { operatingSystem } from "@graphite/utility-functions/platform";
import { isDesktop, operatingSystem } from "@graphite/utility-functions/platform";

import LayoutCol from "@graphite/components/layout/LayoutCol.svelte";
import LayoutRow from "@graphite/components/layout/LayoutRow.svelte";
Expand Down Expand Up @@ -197,7 +197,7 @@
const [accel, oppositeAccel] = operatingSystem() === "Mac" ? [meta, ctrl] : [ctrl, meta];

// Alt-clicking to make a clipping mask
if (layerToClipAltKeyPressed && layerToClipUponClick && layerToClipUponClick.entry.clippable) clipLayer(layerToClipUponClick);
if (alt && layerToClipUponClick && layerToClipUponClick.entry.clippable) clipLayer(layerToClipUponClick);
// Select the layer only if the accel and/or shift keys are pressed
else if (!oppositeAccel && !alt) selectLayer(listing, accel, shift);

Expand All @@ -209,7 +209,13 @@
}

function clippingKeyPress(e: KeyboardEvent) {
layerToClipAltKeyPressed = e.altKey;
const isAltKeyEvent = e.key === "Alt" || e.key === "AltGraph";
if (isAltKeyEvent) {
layerToClipAltKeyPressed = e.type === "keydown";
return;
}

layerToClipAltKeyPressed = e.getModifierState("Alt");
}

function clippingHover(e: PointerEvent) {
Expand Down Expand Up @@ -506,7 +512,7 @@
<LayoutRow class="list-area" classes={{ "drag-ongoing": Boolean(internalDragState?.active && draggingData) }} scrollableY={true}>
<LayoutCol
class="list"
styles={{ cursor: layerToClipUponClick && layerToClipAltKeyPressed && layerToClipUponClick.entry.clippable ? "alias" : "auto" }}
styles={{ cursor: layerToClipUponClick && layerToClipAltKeyPressed && layerToClipUponClick.entry.clippable ? (isDesktop() ? "copy" : "alias") : "auto" }}
data-layer-panel
bind:this={list}
on:click={() => deselectAllLayers()}
Expand Down
Loading