Skip to content

Commit 1483a08

Browse files
nicolodavisdelucis
andauthored
fix UX issues in move debugger (#640)
* fix UX issues in move debugger * fix(debug): Don’t toggle debugger pane while debugger is hidden * fix(debug): Don’t activate move hotkey if Ctrl/Cmd key is pressed Co-authored-by: delucis <[email protected]>
1 parent dc668ec commit 1483a08

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

src/client/debug/Debug.svelte

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@
3030
3131
let visible = true;
3232
function Keypress(e) {
33+
// Toggle debugger visibilty
3334
if (e.key == '.') {
3435
visible = !visible;
3536
return;
3637
}
38+
// Set displayed pane
39+
if (!visible) return;
3740
Object.entries(panes).forEach(([key, { shortcut }]) => {
3841
if (e.key == shortcut) {
3942
pane = key;

src/client/debug/main/Hotkey.svelte

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
}
2424
2525
function Keypress(e) {
26-
if (!$disableHotkeys && !disable && e.key == value) {
26+
if (
27+
!$disableHotkeys && !disable &&
28+
!e.ctrlKey && !e.metaKey &&
29+
e.key == value
30+
) {
2731
e.preventDefault();
2832
Activate();
2933
}

src/client/debug/main/InteractiveFunction.svelte

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
<style>
4545
.move {
46+
display: flex;
47+
flex-direction: row;
4648
cursor: pointer;
4749
margin-left: 10px;
4850
color: #666;
@@ -69,10 +71,14 @@
6971
</style>
7072

7173
<div class="move" class:active on:click={Activate}>
72-
{name}(<span
74+
<span>{name}</span>
75+
<span>(</span>
76+
<span
7377
class="arg-field"
7478
bind:this={span}
7579
on:blur={Deactivate}
80+
on:keypress|stopPropagation={() => {}}
7681
on:keydown={OnKeyDown}
77-
contentEditable />)
82+
contentEditable />
83+
<span>)</span>
7884
</div>

0 commit comments

Comments
 (0)