Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix layout translation in overlay::Group #1686

Merged
merged 1 commit into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ impl<T> Vector<T> {
}
}

impl Vector {
/// The zero [`Vector`].
pub const ZERO: Self = Self::new(0.0, 0.0);
}

impl<T> std::ops::Add for Vector<T>
where
T: std::ops::Add<Output = T>,
Expand Down
4 changes: 2 additions & 2 deletions lazy/src/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,9 @@ where
position: Point,
) -> layout::Node {
self.with_overlay_maybe(|overlay| {
let vector = position - overlay.position();
let translation = position - overlay.position();

overlay.layout(renderer, bounds).translate(vector)
overlay.layout(renderer, bounds, translation)
})
.unwrap_or_default()
}
Expand Down
4 changes: 2 additions & 2 deletions lazy/src/lazy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ where
position: Point,
) -> layout::Node {
self.with_overlay_maybe(|overlay| {
let vector = position - overlay.position();
let translation = position - overlay.position();

overlay.layout(renderer, bounds).translate(vector)
overlay.layout(renderer, bounds, translation)
})
.unwrap_or_default()
}
Expand Down
4 changes: 2 additions & 2 deletions lazy/src/responsive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ where
position: Point,
) -> layout::Node {
self.with_overlay_maybe(|overlay| {
let vector = position - overlay.position();
let translation = position - overlay.position();

overlay.layout(renderer, bounds).translate(vector)
overlay.layout(renderer, bounds, translation)
})
.unwrap_or_default()
}
Expand Down
10 changes: 8 additions & 2 deletions native/src/overlay/element.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ where
}

/// Computes the layout of the [`Element`] in the given bounds.
pub fn layout(&self, renderer: &Renderer, bounds: Size) -> layout::Node {
self.overlay.layout(renderer, bounds, self.position)
pub fn layout(
&self,
renderer: &Renderer,
bounds: Size,
translation: Vector,
) -> layout::Node {
self.overlay
.layout(renderer, bounds, self.position + translation)
}

/// Processes a runtime [`Event`].
Expand Down
6 changes: 4 additions & 2 deletions native/src/overlay/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ where
&self,
renderer: &Renderer,
bounds: Size,
_position: Point,
position: Point,
) -> layout::Node {
let translation = position - Point::ORIGIN;

layout::Node::with_children(
bounds,
self.children
.iter()
.map(|child| child.layout(renderer, bounds))
.map(|child| child.layout(renderer, bounds, translation))
.collect(),
)
}
Expand Down
18 changes: 10 additions & 8 deletions native/src/user_interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ use crate::mouse;
use crate::renderer;
use crate::widget;
use crate::window;
use crate::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
use crate::{
Clipboard, Element, Layout, Point, Rectangle, Shell, Size, Vector,
};

/// A set of interactive graphical elements with a specific [`Layout`].
///
Expand Down Expand Up @@ -203,7 +205,7 @@ where
let bounds = self.bounds;

let mut overlay = manual_overlay.as_mut().unwrap();
let mut layout = overlay.layout(renderer, bounds);
let mut layout = overlay.layout(renderer, bounds, Vector::ZERO);
let mut event_statuses = Vec::new();

for event in events.iter().cloned() {
Expand Down Expand Up @@ -252,7 +254,7 @@ where
overlay = manual_overlay.as_mut().unwrap();

shell.revalidate_layout(|| {
layout = overlay.layout(renderer, bounds);
layout = overlay.layout(renderer, bounds, Vector::ZERO);
});
}

Expand Down Expand Up @@ -434,10 +436,9 @@ where
.as_widget_mut()
.overlay(&mut self.state, Layout::new(&self.base), renderer)
{
let overlay_layout = self
.overlay
.take()
.unwrap_or_else(|| overlay.layout(renderer, self.bounds));
let overlay_layout = self.overlay.take().unwrap_or_else(|| {
overlay.layout(renderer, self.bounds, Vector::ZERO)
});

let new_cursor_position =
if overlay_layout.bounds().contains(cursor_position) {
Expand Down Expand Up @@ -538,7 +539,8 @@ where
renderer,
) {
if self.overlay.is_none() {
self.overlay = Some(overlay.layout(renderer, self.bounds));
self.overlay =
Some(overlay.layout(renderer, self.bounds, Vector::ZERO));
}

overlay.operate(
Expand Down