diff --git a/crates/ui-contract/src/contract/body/window.rs b/crates/ui-contract/src/contract/body/window.rs index 2505a3263..ffe88ce16 100644 --- a/crates/ui-contract/src/contract/body/window.rs +++ b/crates/ui-contract/src/contract/body/window.rs @@ -480,10 +480,6 @@ impl BodyHooks<'_> { /// are never its. pub(super) fn window_os(&mut self, viewport: ViewportId, props: &ContainerProps, cx: &mut Cx<'_, C>) { let by_caller = overlay_of(props).is_some_and(|overlay| overlay.resize.by_caller); - // DIAG FW-280 - if by_caller { - eprintln!("DIAG FW-280 window_os: viewport={viewport:?}"); - } if by_caller { let limits = overlay_of(props).map(|overlay| Limits::new(overlay, window_min(props, cx.style.metrics().min_size))); if let Some(limits) = limits { @@ -528,12 +524,6 @@ impl BodyHooks<'_> { let (dx, dy, _) = GRIPS[sizing.grip]; limits.resized(sizing.start, dx, dy, desktop - sizing.pressed) }; - // DIAG FW-280 - eprintln!( - "DIAG FW-280 window_resize: sizing={:?} phases={:?} outer={outer:?}", - self.mode.sizing.map(|sizing| (sizing.grip, sizing.start, sizing.at)), - (0..GRIPS.len()).map(|index| phase(index).map(|phase| format!("{phase:?}"))).collect::>() - ); let Some(mut sizing) = self.mode.sizing else { let started = (0..GRIPS.len()).find_map(|index| match phase(index)? { PressPhase::DragStart { start, pos, .. } => Some((index, start.origin, pos)), @@ -732,10 +722,6 @@ impl BodyHooks<'_> { Mount::Window { resize } => (resize.edges, handle / 2.0), _ => (ResizeEdges::NONE, 0.0), }; - // DIAG FW-280 - if overlay_of(props).is_some_and(|overlay| overlay.resize.by_caller) { - eprintln!("DIAG FW-280 move_parts: os={os:?} edges={edges:?} grips={} rect={rect:?} handle={handle} held={held:?}", stands.grips); - } if edges == ResizeEdges::NONE || !stands.grips { return; } diff --git a/crates/ui-patterns/src/patterns/dock/area.rs b/crates/ui-patterns/src/patterns/dock/area.rs index be8352314..316b7e358 100644 --- a/crates/ui-patterns/src/patterns/dock/area.rs +++ b/crates/ui-patterns/src/patterns/dock/area.rs @@ -988,8 +988,6 @@ impl Pass<'_, P> { } else { grid.steps_within(change.rect.width()) }; - // DIAG FW-280 - eprintln!("DIAG FW-280 stepped_resize: change={change:?} fitted={fitted:?} steps={steps} to={to}"); if to != steps { self.report.actions.push(Action::set_column_steps(first.clone(), to)); } @@ -1242,10 +1240,6 @@ impl Pass<'_, P> { cross_window::accept_cross_window(&ctx); self.report.actions.push(dropped.action); } - // DIAG FW-280 - if output.placed.is_some() { - eprintln!("DIAG FW-280 windows: placed={:?} fitted={:?} native={}", output.placed, shape.fitted, opening.spec.is_some()); - } // A resize of a window whose column has steps: the steps it sets, and the window's rect at them. let resized = output .placed diff --git a/crates/ui-test-kit/src/windows.rs b/crates/ui-test-kit/src/windows.rs index 1769489a9..a7b426efc 100644 --- a/crates/ui-test-kit/src/windows.rs +++ b/crates/ui-test-kit/src/windows.rs @@ -140,7 +140,8 @@ fn render_child(ctx: &Context, viewport: egui::ImmediateViewport<'_>) { events, hovered_files, dropped_files, - screen_rect: Some(Rect::from_min_size(Pos2::ZERO, CHILD_SIZE)), + // The pass lays out in the window as large as its facts say, as the OS gives it. + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, info.inner_rect.map_or(CHILD_SIZE, |inner| inner.size()))), ..RawInput::default() }; input.time = Some(NOW.with(Cell::get));