Merge commit 'd87c24a93e'; commit 'cea4209559' into fx/all-1117

This commit is contained in:
aiongg
2026-11-17 15:26:20 +00:00
3 changed files with 2 additions and 21 deletions
@@ -480,10 +480,6 @@ impl BodyHooks<'_> {
/// are never its.
pub(super) fn window_os<C: Container>(&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::<Vec<_>>()
);
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;
}
@@ -988,8 +988,6 @@ impl<P: Clone + Eq + Hash + Debug + Send + Sync + 'static> 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<P: Clone + Eq + Hash + Debug + Send + Sync + 'static> 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
+2 -1
View File
@@ -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));