This commit is contained in:
space-nuko
2023-05-27 01:30:20 -05:00
parent a0b7418caf
commit 49ede4e2c8
3 changed files with 15 additions and 14 deletions

View File

@@ -218,10 +218,6 @@
} }
lastError = $uiState.activeError; lastError = $uiState.activeError;
} }
else if (activeError == null) {
hideError();
lastError = null
}
} }
async function showError(promptIDWithError: PromptID) { async function showError(promptIDWithError: PromptID) {
@@ -241,6 +237,7 @@
workflowState.setActiveWorkflow(app.lCanvas, workflow.id); workflowState.setActiveWorkflow(app.lCanvas, workflow.id);
$uiState.activeError = promptIDWithError; $uiState.activeError = promptIDWithError;
lastError = $uiState.activeError;
const jumpToError = () => { const jumpToError = () => {
app.resizeCanvas(); app.resizeCanvas();
@@ -257,7 +254,7 @@
if (willOpenPane) { if (willOpenPane) {
const graphPane = getGraphPane(); const graphPane = getGraphPane();
if (graphPane) { if (graphPane) {
graphPane.addEventListener("transitionend", jumpToError) graphPane.addEventListener("transitionend", jumpToError, { once: true })
await tick() await tick()
} }
else { else {

View File

@@ -97,7 +97,7 @@
</div> </div>
{#if canJumpToDisconnectedInput(error)} {#if canJumpToDisconnectedInput(error)}
<div style:display="flex" style:flex-direction="row"> <div style:display="flex" style:flex-direction="row">
<button class="jump-to-error" on:click={() => jumpToDisconnectedInput(error)}><span></span></button> <button class="jump-to-error locate" on:click={() => jumpToDisconnectedInput(error)}><span></span></button>
<span>Find disconnected input</span> <span>Find disconnected input</span>
</div> </div>
{/if} {/if}
@@ -216,6 +216,9 @@
&.execution-error { &.execution-error {
background: #848; background: #848;
} }
&.locate {
background: #488;
}
width: 32px; width: 32px;
height: 32px; height: 32px;
font-size: 14pt; font-size: 14pt;

View File

@@ -33,14 +33,12 @@
<DropZone {app} /> <DropZone {app} />
</div> </div>
<div class="bar"> <div class="bar">
{#if !$interfaceState.graphTransitioning} <span class="left">
<span class="left"> <button disabled={$interfaceState.graphTransitioning} on:click={doRecenter}>Recenter</button>
<button on:click={doRecenter}>Recenter</button> {#if $uiState.activeError != null}
{#if $uiState.activeError != null} <button disabled={$interfaceState.graphTransitioning} on:click={clearErrors}>Clear Errors</button>
<button on:click={clearErrors}>Clear Errors</button> {/if}
{/if} </span>
</span>
{/if}
</div> </div>
{#if $uiState.activeError && app?.lCanvas?.activeErrors != null} {#if $uiState.activeError && app?.lCanvas?.activeErrors != null}
<ComfyGraphErrorList {app} errors={app.lCanvas.activeErrors} /> <ComfyGraphErrorList {app} errors={app.lCanvas.activeErrors} />
@@ -95,6 +93,9 @@
background-color: #555; background-color: #555;
border-color: #777; border-color: #777;
} }
&:disabled {
opacity: 50%;
}
} }
} }
</style> </style>