Rename method to is_over
This commit is contained in:
parent
d470467718
commit
be860508a9
5 changed files with 13 additions and 37 deletions
|
|
@ -652,11 +652,7 @@ mod toast {
|
|||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
fn contains_cursor(
|
||||
&self,
|
||||
layout: Layout<'_>,
|
||||
cursor_position: Point,
|
||||
) -> bool {
|
||||
fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
|
||||
layout
|
||||
.children()
|
||||
.any(|layout| layout.bounds().contains(cursor_position))
|
||||
|
|
|
|||
|
|
@ -90,12 +90,8 @@ where
|
|||
mouse::Interaction::Idle
|
||||
}
|
||||
|
||||
/// Whether the [`Overlay`] contains the cursor
|
||||
fn contains_cursor(
|
||||
&self,
|
||||
layout: Layout<'_>,
|
||||
cursor_position: Point,
|
||||
) -> bool {
|
||||
/// Returns true if the cursor is over the [`Overlay`]
|
||||
fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
|
||||
layout.bounds().contains(cursor_position)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,13 +116,9 @@ where
|
|||
self.overlay.operate(layout, renderer, operation);
|
||||
}
|
||||
|
||||
/// Whether the [`Overlay`] contains the cursor
|
||||
pub fn contains_cursor(
|
||||
&self,
|
||||
layout: Layout<'_>,
|
||||
cursor_position: Point,
|
||||
) -> bool {
|
||||
self.overlay.contains_cursor(layout, cursor_position)
|
||||
/// Returns true if the cursor is over the [`Element`]
|
||||
pub fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
|
||||
self.overlay.is_over(layout, cursor_position)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -262,11 +258,7 @@ where
|
|||
.draw(renderer, theme, style, layout, cursor_position)
|
||||
}
|
||||
|
||||
fn contains_cursor(
|
||||
&self,
|
||||
layout: Layout<'_>,
|
||||
cursor_position: Point,
|
||||
) -> bool {
|
||||
self.content.contains_cursor(layout, cursor_position)
|
||||
fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
|
||||
self.content.is_over(layout, cursor_position)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,17 +152,11 @@ where
|
|||
});
|
||||
}
|
||||
|
||||
fn contains_cursor(
|
||||
&self,
|
||||
layout: Layout<'_>,
|
||||
cursor_position: Point,
|
||||
) -> bool {
|
||||
fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
|
||||
self.children
|
||||
.iter()
|
||||
.zip(layout.children())
|
||||
.any(|(child, layout)| {
|
||||
child.contains_cursor(layout, cursor_position)
|
||||
})
|
||||
.any(|(child, layout)| child.is_over(layout, cursor_position))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ where
|
|||
let base_cursor = if manual_overlay
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.contains_cursor(Layout::new(&layout), cursor_position)
|
||||
.is_over(Layout::new(&layout), cursor_position)
|
||||
{
|
||||
// TODO: Type-safe cursor availability
|
||||
Point::new(-1.0, -1.0)
|
||||
|
|
@ -508,10 +508,8 @@ where
|
|||
);
|
||||
});
|
||||
|
||||
if overlay.contains_cursor(
|
||||
Layout::new(layout),
|
||||
cursor_position,
|
||||
) {
|
||||
if overlay.is_over(Layout::new(layout), cursor_position)
|
||||
{
|
||||
overlay_interaction
|
||||
} else {
|
||||
base_interaction
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue