masi/solvecraft
1
0
Fork 0
mirror of https://github.com/bherbruck/solidcraft.git synced 2026-11-03 02:25:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Shell: content kept outside a changed viewport no longer turns inside out and crashes the Render frame overlay (#9271)

Browse Source 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
semmelrinde
2026-10-30 07:01:16 +00:00
committed by GitHub
parent 3d744cc8a2
commit 8251be9c06
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/shell.rs
+22 -12
View File
@@ -132,7 +132,7 @@ pub(crate) fn register_panel(app: &mut SolveApp, id: &'static str, rect: Option<
/// Shared workspace-card bounds below the ribbon and above a floating bottom strip.
pub(crate) fn panel_bounds(app: &SolveApp, mut available: Rect) -> Rect {
for card in &app.shell.cards {
available.min.y = card.bottom().clamp(available.top(), available.bottom());
available.min.y = within(card.bottom(), available.top(), available.bottom());
}
if crate::render_workspace::active(app) {
let bottom = app.shell.cards.iter().map(|r| r.bottom()).fold(available.top() - Tokens::get().space_8, f32::max);
@@ -140,7 +140,7 @@ pub(crate) fn panel_bounds(app: &SolveApp, mut available: Rect) -> Rect {
}
for (rect, edge) in app.shell.workspace_panels.values() {
if matches!(edge, Some(crate::ui_kit::Edge::Bottom)) {
available.max.y = rect.top().clamp(available.top(), available.bottom());
available.max.y = within(rect.top(), available.top(), available.bottom());
}
}
available
@@ -205,7 +205,17 @@ pub(crate) fn bottom_overlay_rect(app: &SolveApp, mut viewport: Rect) -> Rect {
/// The former central panel remains the anchor for controls and docked panels.
pub(crate) fn content_rect(app: &SolveApp, viewport: Rect) -> Rect {
app.shell.content.unwrap_or(viewport).intersect(viewport)
// The content kept from the last frame can lie outside a viewport that has shrunk or moved
// since (a resize, a new scale): the intersection is then turned inside out, its min past
// its max. The viewport stands in for it.
let content = app.shell.content.unwrap_or(viewport).intersect(viewport);
if content.is_positive() { content } else { viewport }
}
/// `v` kept within `lo..=hi`, or `lo` when that range is empty: `f32::clamp` panics on
/// `lo > hi`, which a rect squeezed to nothing between cards gives.
fn within(v: f32, lo: f32, hi: f32) -> f32 {
if lo <= hi { v.clamp(lo, hi) } else { lo }
}
/// Free anchor space shared by both layouts. Compact edge hosts have already consumed
@@ -218,10 +228,10 @@ pub(crate) fn workspace_content(app: &SolveApp, mut content: Rect) -> Rect {
let gap = Container::floating_card(Surface::Panel).gap();
for (rect, edge) in app.shell.workspace_panels.values() {
match edge {
Some(crate::ui_kit::Edge::Left) => content.min.x = (rect.right() + gap).clamp(content.left(), content.right()),
Some(crate::ui_kit::Edge::Right) => content.max.x = (rect.left() - gap).clamp(content.left(), content.right()),
Some(crate::ui_kit::Edge::Bottom) => content.max.y = (rect.top() - gap).clamp(content.top(), content.bottom()),
Some(crate::ui_kit::Edge::Top) => content.min.y = (rect.bottom() + gap).clamp(content.top(), content.bottom()),
Some(crate::ui_kit::Edge::Left) => content.min.x = within(rect.right() + gap, content.left(), content.right()),
Some(crate::ui_kit::Edge::Right) => content.max.x = within(rect.left() - gap, content.left(), content.right()),
Some(crate::ui_kit::Edge::Bottom) => content.max.y = within(rect.top() - gap, content.top(), content.bottom()),
Some(crate::ui_kit::Edge::Top) => content.min.y = within(rect.bottom() + gap, content.top(), content.bottom()),
None => {}
}
}
@@ -230,16 +240,16 @@ pub(crate) fn workspace_content(app: &SolveApp, mut content: Rect) -> Rect {
let gap = Container::for_layout(app.ui.layout, Surface::Panel).gap();
if let Some(history) = app.shell.history {
if app.preferences.timeline_left {
content.min.x = (history.right() + gap).clamp(content.left(), content.right());
content.min.x = within(history.right() + gap, content.left(), content.right());
} else {
content.max.y = (history.top() - gap).clamp(content.top(), content.bottom());
content.max.y = within(history.top() - gap, content.top(), content.bottom());
}
}
if let Some(browser) = app.shell.browser {
content.min.x = (browser.right() + gap).clamp(content.left(), content.right());
content.min.x = within(browser.right() + gap, content.left(), content.right());
}
if let Some(column) = app.shell.dialog_column {
content.min.x = (column.right() + gap).clamp(content.left(), content.right());
content.min.x = within(column.right() + gap, content.left(), content.right());
}
content
}
@@ -250,7 +260,7 @@ pub(crate) fn tool_drag_rect(app: &SolveApp, placement: Rect) -> Rect {
let gap = Container::for_layout(app.ui.layout, Surface::Feature).gap();
let mut bounds = crate::agent_chat::tool_space(app, app.viewport.rect.unwrap_or(placement));
for card in app.shell.cards.iter().filter(|r| r.is_finite() && r.is_positive()) {
bounds.min.y = (card.bottom() + gap).clamp(bounds.top(), bounds.bottom());
bounds.min.y = within(card.bottom() + gap, bounds.top(), bounds.bottom());
}
bounds
}
crates/ui-egui/src/shell_tests.rs
+21
View File
@@ -1190,3 +1190,24 @@ fn status_bar_stays_out_of_the_embed() {
assert!(!crate::status_bar::shown(&h.app));
assert!(rect_of("status:bar").is_none() && h.app.shell.status_bar.is_none());
}
/// Content kept from an earlier frame that lies outside the viewport now (the window shrank, the
/// scale grew) gave an inside-out content rect, min past max, and the Render workspace's frame
/// overlay panicked clamping into it: `min > max, or either was NaN. min = 1004.0, max = 937.8125`.
/// The viewport stands in for such content, and the space left beside cards never panics.
#[test]
fn content_outside_a_shrunk_viewport_gives_way_to_the_viewport() {
let mut h = Harness::new();
let viewport = Rect::from_min_max(pos2(0.0, 0.0), pos2(800.0, 600.0));
h.app.shell.content = Some(Rect::from_min_max(pos2(900.0, 650.0), pos2(1600.0, 1000.0)));
assert_eq!(content_rect(&h.app, viewport), viewport);
// A rect already turned inside out, with History and Browser cards at its edges.
let inside_out = Rect::from_min_max(pos2(500.0, 1004.0), pos2(300.0, 938.0));
h.app.shell.history = Some(Rect::from_min_max(pos2(0.0, 900.0), pos2(800.0, 1000.0)));
h.app.shell.browser = Some(Rect::from_min_max(pos2(0.0, 0.0), pos2(200.0, 800.0)));
for left in [false, true] {
h.app.preferences.timeline_left = left;
let free = workspace_content(&h.app, inside_out);
assert!(free.min.x.is_finite() && free.min.y.is_finite(), "{free:?}");
}
}