diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs index 3cff381d..659a585d 100644 --- a/editor/src/messages/portfolio/portfolio_message_handler.rs +++ b/editor/src/messages/portfolio/portfolio_message_handler.rs @@ -275,7 +275,6 @@ impl MessageHandler self.executor.update_imaginate_preferences(preferences.get_imaginate_preferences()), PortfolioMessage::ImaginateServerHostname => { - debug!("setting imaginate persistent data"); self.persistent_data.imaginate.set_host_name(&preferences.imaginate_server_hostname); } PortfolioMessage::Import => { diff --git a/editor/src/node_graph_executor.rs b/editor/src/node_graph_executor.rs index cb9ac055..b9149863 100644 --- a/editor/src/node_graph_executor.rs +++ b/editor/src/node_graph_executor.rs @@ -222,7 +222,6 @@ impl NodeRuntime { graphic_group.render_svg(&mut render, &render_params); let [min, max] = bounds.unwrap_or_default(); render.format_svg(min, max); - debug!("SVG {}", render.svg); if let Some(node_id) = node_path.get(node_path.len() - 2).copied() { let graph_identifier = GraphIdentifier::new(layer_path.last().copied()); @@ -498,11 +497,10 @@ impl NodeGraphExecutor { } } TaggedValue::Artboard(artboard) => { - debug!("{artboard:#?}"); + warn!("Rendered graph produced artboard (which is not currently rendered): {artboard:#?}"); return Err("Artboard (see console)".to_string()); } TaggedValue::GraphicGroup(graphic_group) => { - debug!("{graphic_group:#?}"); use graphene_core::renderer::{GraphicElementRendered, RenderParams, SvgRender}; // Setup rendering @@ -521,8 +519,6 @@ impl NodeGraphExecutor { // Send to frontend responses.add(FrontendMessage::UpdateDocumentNodeRender { svg }); - - //return Err("Graphic group (see console)".to_string()); } _ => { return Err(format!("Invalid node graph output type: {:#?}", node_graph_output)); diff --git a/frontend/src/components/Editor.svelte b/frontend/src/components/Editor.svelte index 7719d568..b98c8877 100644 --- a/frontend/src/components/Editor.svelte +++ b/frontend/src/components/Editor.svelte @@ -206,10 +206,10 @@ box-shadow: inset 0 0 0 1px var(--color-5-dullgray); border: 2px solid transparent; border-radius: 10px; + } - &:hover { - box-shadow: inset 0 0 0 1px var(--color-6-lowergray); - } + &:hover::-webkit-scrollbar-track { + box-shadow: inset 0 0 0 1px var(--color-6-lowergray); } &::-webkit-scrollbar-thumb { @@ -218,10 +218,10 @@ border: 2px solid transparent; border-radius: 10px; margin: 2px; + } - &:hover { - background-color: var(--color-6-lowergray); - } + &:hover::-webkit-scrollbar-thumb { + background-color: var(--color-6-lowergray); } &::-webkit-scrollbar-corner { diff --git a/frontend/src/components/layout/LayoutCol.svelte b/frontend/src/components/layout/LayoutCol.svelte index 50b58773..3775987a 100644 --- a/frontend/src/components/layout/LayoutCol.svelte +++ b/frontend/src/components/layout/LayoutCol.svelte @@ -23,6 +23,7 @@ } +
+
("editor"); const document = getContext("document"); - // Graph view overlay - let graphViewOverlayOpen = false; - // Interactive text editing let textInput: undefined | HTMLDivElement = undefined; let showTextInput: boolean; @@ -68,7 +65,6 @@ let nodeRenderSvg = ""; let artboardSvg = ""; let overlaysSvg = ""; - let artworkTransform = ""; // Rasterized SVG viewport data, or none if it's not up-to-date let rasterizedCanvas: HTMLCanvasElement | undefined = undefined; @@ -338,11 +334,6 @@ } onMount(() => { - // Show or hide the graph view overlay - editor.subscriptions.subscribeJsMessage(TriggerGraphViewOverlay, (triggerGraphViewOverlay) => { - graphViewOverlayOpen = triggerGraphViewOverlay.open; - }); - // Update rendered SVGs editor.subscriptions.subscribeJsMessage(UpdateDocumentArtwork, async (data) => { await tick(); @@ -364,11 +355,6 @@ updateDocumentNodeRender(data.svg); }); - editor.subscriptions.subscribeJsMessage(UpdateDocumentTransform, async (data) => { - await tick(); - - updateDocumentTransform(data.transform); - }); editor.subscriptions.subscribeJsMessage(UpdateEyedropperSamplingState, async (data) => { await tick(); @@ -436,8 +422,8 @@ - - {#if !graphViewOverlayOpen} + + {#if !$document.graphViewOverlayOpen} @@ -448,7 +434,7 @@ - {#if !graphViewOverlayOpen} + {#if !$document.graphViewOverlayOpen} @@ -483,7 +469,7 @@ {@html artboardSvg} - + {@html nodeRenderSvg} @@ -499,7 +485,7 @@ {/if}
-
+
diff --git a/frontend/src/components/panels/LayerTree.svelte b/frontend/src/components/panels/LayerTree.svelte index 319a4eb1..19a133c9 100644 --- a/frontend/src/components/panels/LayerTree.svelte +++ b/frontend/src/components/panels/LayerTree.svelte @@ -450,7 +450,7 @@ border-radius: 2px; &:hover { - background: var(--color-6-lowergray); + background: var(--color-5-dullgray); } &::after { @@ -461,19 +461,11 @@ border-style: solid; border-width: 3px 0 3px 6px; border-color: transparent transparent transparent var(--color-e-nearwhite); - - &:hover { - color: var(--color-f-white); - } } &.expanded::after { border-width: 6px 3px 0 3px; border-color: var(--color-e-nearwhite) transparent transparent transparent; - - &:hover { - color: var(--color-f-white); - } } } @@ -488,7 +480,6 @@ &.selected { background: var(--color-5-dullgray); - color: var(--color-f-white); } .layer-type-icon { diff --git a/frontend/src/components/views/Graph.svelte b/frontend/src/components/views/Graph.svelte index 2849ff61..c4b90942 100644 --- a/frontend/src/components/views/Graph.svelte +++ b/frontend/src/components/views/Graph.svelte @@ -5,7 +5,6 @@ import { UpdateNodeGraphSelection } from "@graphite/wasm-communication/messages"; import type { FrontendNodeLink, FrontendNodeType, FrontendNode } from "@graphite/wasm-communication/messages"; import LayoutCol from "@graphite/components/layout/LayoutCol.svelte"; - import LayoutRow from "@graphite/components/layout/LayoutRow.svelte"; import TextButton from "@graphite/components/widgets/buttons/TextButton.svelte"; import TextInput from "@graphite/components/widgets/inputs/TextInput.svelte"; import IconLabel from "@graphite/components/widgets/labels/IconLabel.svelte"; @@ -24,7 +23,7 @@ type LinkPath = { pathString: string; dataType: string; thick: boolean }; - let graph: LayoutRow | undefined; + let graph: HTMLDivElement | undefined; let nodesContainer: HTMLDivElement | undefined; let nodeSearchInput: TextInput | undefined; @@ -52,7 +51,7 @@ let appearRightOfMouse = false; $: (() => { - const bounds = graph?.div()?.getBoundingClientRect(); + const bounds = graph?.getBoundingClientRect(); if (!bounds) return; const { width, height } = bounds; @@ -239,7 +238,7 @@ let zoomFactor = 1 + Math.abs(scrollY) * WHEEL_RATE; if (scrollY > 0) zoomFactor = 1 / zoomFactor; - const bounds = graph?.div()?.getBoundingClientRect(); + const bounds = graph?.getBoundingClientRect(); if (!bounds) return; const { x, y, width, height } = bounds; @@ -286,7 +285,7 @@ // Create the add node popup on right click, then exit if (rmb) { - const graphBounds = graph?.div()?.getBoundingClientRect(); + const graphBounds = graph?.getBoundingClientRect(); if (!graphBounds) return; nodeListLocation = { x: Math.round(((e.clientX - graphBounds.x) / transform.scale - transform.x) / GRID_SIZE), @@ -567,20 +566,18 @@ }); - {#if nodeListLocation} @@ -595,7 +592,7 @@ }} > (searchTerm = detail)} bind:this={nodeSearchInput} /> -
+
{#each nodeCategories as nodeCategory}
@@ -802,12 +799,15 @@
{/each}
-
+