Skip to content

Desktop: Fix the Text tool not working with the hole punch #3012

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
TrueDoctor merged 3 commits into from
Aug 7, 2025
Merged

Desktop: Fix the Text tool not working with the hole punch #3012

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a0ed4f
Make viewport element transparent when hole punch is enabled
timon-schelling Aug 6, 2025
a6451cf
Fix formatting
timon-schelling Aug 6, 2025
c5f42dc
Merge branch 'master' into desktop-fix-text-tool
timon-schelling Aug 7, 2025
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
31 changes: 22 additions & 9 deletions frontend/src/components/panels/Document.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,16 +533,24 @@
y={cursorTop}
/>
{/if}
{#if !$appWindow.viewportHolePunch}
<div class="viewport" on:pointerdown={(e) => canvasPointerDown(e)} bind:this={viewport} data-viewport>
<div
class:viewport={!$appWindow.viewportHolePunch}
class:viewport-transparent={$appWindow.viewportHolePunch}
on:pointerdown={(e) => canvasPointerDown(e)}
bind:this={viewport}
data-viewport
>
{#if !$appWindow.viewportHolePunch}
<svg class="artboards" style:width={canvasWidthCSS} style:height={canvasHeightCSS}>
{@html artworkSvg}
</svg>
<div class="text-input" style:width={canvasWidthCSS} style:height={canvasHeightCSS} style:pointer-events={showTextInput ? "auto" : ""}>
{#if showTextInput}
<div bind:this={textInput} style:transform="matrix({textInputMatrix})" on:scroll={preventTextEditingScroll} />
{/if}
</div>
{/if}
<div class="text-input" style:width={canvasWidthCSS} style:height={canvasHeightCSS} style:pointer-events={showTextInput ? "auto" : ""}>
{#if showTextInput}
<div bind:this={textInput} style:transform="matrix({textInputMatrix})" on:scroll={preventTextEditingScroll} />
{/if}
</div>
{#if !$appWindow.viewportHolePunch}
<canvas
class="overlays"
width={canvasWidthScaledRoundedToEven}
Expand All @@ -552,8 +560,9 @@
data-overlays-canvas
>
</canvas>
</div>
{/if}
{/if}
</div>

<div class="graph-view" class:open={$document.graphViewOverlayOpen} style:--fade-artwork={`${$document.fadeArtwork}%`} data-graph>
<Graph />
</div>
Expand Down Expand Up @@ -757,6 +766,10 @@

.viewport {
background: var(--color-2-mildblack);
}

.viewport,
.viewport-transparent {
width: 100%;
height: 100%;
// Allows the SVG to be placed at explicit integer values of width and height to prevent non-pixel-perfect SVG scaling
Expand Down
Loading