From 61479f27a7ed4f4c075f91e9f5ce57cb277271b6 Mon Sep 17 00:00:00 2001 From: Sumeet Jha <109774891+O1sumitkumar@users.noreply.github.com> Date: Sun, 1 Nov 2026 09:25:02 +0530 Subject: [PATCH 1/2] fix(export): use the renderer's split gap when fitting a target width --- crates/renderer/src/canvas.rs | 5 +---- crates/renderer/src/layout.rs | 4 ++++ crates/renderer/src/svg.rs | 5 +---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/renderer/src/canvas.rs b/crates/renderer/src/canvas.rs index c6720f9..1390428 100644 --- a/crates/renderer/src/canvas.rs +++ b/crates/renderer/src/canvas.rs @@ -13,7 +13,7 @@ use web_sys::{CanvasRenderingContext2d, HtmlCanvasElement}; use crate::layout::{ compute_layout, split_tokens_into_lines, Layout, CARD_SHADOW_BLUR, CARD_SHADOW_OFFSET_Y, - TRAFFIC_LIGHT_OFFSET_X, TRAFFIC_LIGHT_PITCH, TRAFFIC_LIGHT_RADIUS, + SPLIT_GAP, TRAFFIC_LIGHT_OFFSET_X, TRAFFIC_LIGHT_PITCH, TRAFFIC_LIGHT_RADIUS, }; /// Conservative maximum canvas dimension in *device* pixels. Safari caps @@ -372,9 +372,6 @@ pub fn render_to_canvas( Ok(prepared.layout) } -/// Gap between the two panels in split-screen mode (logical px). -const SPLIT_GAP: f64 = 6.0; - /// Fully-resolved geometry for a split-screen render. #[derive(Clone, Debug)] pub struct SplitLayout { diff --git a/crates/renderer/src/layout.rs b/crates/renderer/src/layout.rs index dd43f14..9f0687c 100644 --- a/crates/renderer/src/layout.rs +++ b/crates/renderer/src/layout.rs @@ -9,6 +9,10 @@ pub const TAB_WIDTH: usize = 4; /// Inner padding between the code-card edge and the text (logical px). pub const INNER_PADDING: f64 = 16.0; +/// Gap between the two panels in split-screen mode (logical px). Shared by the +/// canvas and SVG renderers and by the app's target-width math, so they agree. +pub const SPLIT_GAP: f64 = 6.0; + /// Height of the macOS-style window header bar (logical px). pub const FRAME_HEADER_HEIGHT: f64 = 40.0; diff --git a/crates/renderer/src/svg.rs b/crates/renderer/src/svg.rs index 20200b6..29b7690 100644 --- a/crates/renderer/src/svg.rs +++ b/crates/renderer/src/svg.rs @@ -8,7 +8,7 @@ use codeframe_models::{Background, ExportOptions, FontStyle, GradientDir, ThemeP use crate::layout::{ compute_layout, split_tokens_into_lines, Layout, CARD_SHADOW_BLUR, CARD_SHADOW_OFFSET_Y, - TRAFFIC_LIGHT_OFFSET_X, TRAFFIC_LIGHT_PITCH, TRAFFIC_LIGHT_RADIUS, + SPLIT_GAP, TRAFFIC_LIGHT_OFFSET_X, TRAFFIC_LIGHT_PITCH, TRAFFIC_LIGHT_RADIUS, }; /// macOS traffic-light colors (close, minimize, zoom). @@ -251,9 +251,6 @@ pub fn render_svg( (svg, layout) } -/// Gap between panels in split-screen SVG (logical px). -const SPLIT_GAP: f64 = 6.0; - /// Render two code panels side by side as a single SVG. pub fn render_split_svg( tokens_left: &[Token], From 9c55fbe39a0202a9795ed7baab6e15da4f5a3fb3 Mon Sep 17 00:00:00 2001 From: Sumeet Jha <109774891+O1sumitkumar@users.noreply.github.com> Date: Sun, 1 Nov 2026 09:25:28 +0530 Subject: [PATCH 2/2] fix(export): use the renderer's split gap when fitting a target width --- crates/app/src/export.rs | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/crates/app/src/export.rs b/crates/app/src/export.rs index a0e204a..22bc114 100644 --- a/crates/app/src/export.rs +++ b/crates/app/src/export.rs @@ -263,7 +263,8 @@ fn compute_split_scale_for_width( let layout_right = codeframe_renderer::compute_layout(options, lines_right.len(), max_right, char_width); - let total_width = layout_left.canvas_width + 16.0 + layout_right.canvas_width; + let total_width = + layout_left.canvas_width + codeframe_renderer::layout::SPLIT_GAP + layout_right.canvas_width; (target_width / total_width).clamp(0.5, 12.0) } @@ -338,3 +339,39 @@ async fn do_copy(settings: Settings) -> Result<(), String> { .map_err(|e| format!("{e:?}"))?; Ok(()) } + +#[cfg(test)] +mod tests { + use super::*; + use codeframe_models::{ExportOptions, FontStyle, RgbColor, ThemePalette, Token}; + use codeframe_renderer::svg::render_split_svg; + + fn tokens(text: &str) -> Vec { + vec![Token { + text: text.to_string(), + color: RgbColor::new(0xf8, 0xf8, 0xf2), + font_style: FontStyle::default(), + }] + } + + #[test] + fn split_scale_makes_export_match_target_width() { + let palette = ThemePalette { + background: RgbColor::new(0x28, 0x2a, 0x36), + foreground: RgbColor::new(0xf8, 0xf8, 0xf2), + }; + let options = ExportOptions::default(); + let left = tokens("fn main() {}"); + let right = tokens("let answer = 42;\nprintln!(\"{answer}\");"); + let target = 1920.0; + + let scale = compute_split_scale_for_width(&left, &right, &options, target); + let (_, logical_width, _) = render_split_svg(&left, &palette, &right, &palette, &options); + + let exported_width = logical_width * scale; + assert!( + (exported_width - target).abs() < 0.5, + "split export is {exported_width}px wide, expected {target}px" + ); + } +}