summaryrefslogtreecommitdiffstats
path: root/native/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'native/src/widget')
-rw-r--r--native/src/widget/button.rs2
-rw-r--r--native/src/widget/checkbox.rs2
-rw-r--r--native/src/widget/column.rs4
-rw-r--r--native/src/widget/container.rs4
-rw-r--r--native/src/widget/image/viewer.rs2
-rw-r--r--native/src/widget/pane_grid.rs4
-rw-r--r--native/src/widget/pane_grid/content.rs6
-rw-r--r--native/src/widget/pane_grid/title_bar.rs6
-rw-r--r--native/src/widget/pick_list.rs2
-rw-r--r--native/src/widget/radio.rs2
-rw-r--r--native/src/widget/row.rs4
-rw-r--r--native/src/widget/scrollable.rs4
-rw-r--r--native/src/widget/slider.rs2
-rw-r--r--native/src/widget/text_input.rs2
-rw-r--r--native/src/widget/toggler.rs2
-rw-r--r--native/src/widget/tooltip.rs11
16 files changed, 35 insertions, 24 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 588833a4..0d9eeebd 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -251,8 +251,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
let is_mouse_over = layout.bounds().contains(cursor_position);
let is_disabled = self.on_press.is_none();
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index b19a0a25..04f62cd9 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -193,8 +193,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer
diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index 1d2c8485..0d4d6fa7 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -167,8 +167,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
self.children
.iter()
@@ -176,8 +176,8 @@ where
.map(|(child, layout)| {
child.widget.mouse_interaction(
layout,
- viewport,
cursor_position,
+ viewport,
)
})
.max()
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 5ad07d6d..9e3d0193 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -182,13 +182,13 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
self.content.widget.mouse_interaction(
layout.children().next().unwrap(),
- viewport,
cursor_position,
+ viewport,
)
}
diff --git a/native/src/widget/image/viewer.rs b/native/src/widget/image/viewer.rs
index d9eccfad..95e5c6e4 100644
--- a/native/src/widget/image/viewer.rs
+++ b/native/src/widget/image/viewer.rs
@@ -284,8 +284,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index 48243c0b..d98369e4 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -474,8 +474,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
if self.state.picked_pane().is_some() {
return mouse::Interaction::Grab;
@@ -492,7 +492,7 @@ where
.iter()
.zip(layout.children())
.map(|((_pane, content), layout)| {
- content.mouse_interaction(layout, viewport, cursor_position)
+ content.mouse_interaction(layout, cursor_position, viewport)
})
.max()
.unwrap_or_default()
diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index efb3493b..c44506dd 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -201,8 +201,8 @@ where
pub(crate) fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
let (body_layout, title_bar_interaction) =
if let Some(title_bar) = &self.title_bar {
@@ -218,8 +218,8 @@ where
let mouse_interaction = title_bar.mouse_interaction(
title_bar_layout,
- viewport,
cursor_position,
+ viewport,
);
(children.next().unwrap(), mouse_interaction)
@@ -228,7 +228,7 @@ where
};
self.body
- .mouse_interaction(body_layout, viewport, cursor_position)
+ .mouse_interaction(body_layout, cursor_position, viewport)
.max(title_bar_interaction)
}
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index ffd59488..070cf404 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -256,8 +256,8 @@ where
pub(crate) fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
let mut children = layout.children();
let padded = children.next().unwrap();
@@ -267,15 +267,15 @@ where
let title_interaction = self.content.mouse_interaction(
title_layout,
- viewport,
cursor_position,
+ viewport,
);
if let Some(controls) = &self.controls {
let controls_layout = children.next().unwrap();
controls
- .mouse_interaction(controls_layout, viewport, cursor_position)
+ .mouse_interaction(controls_layout, cursor_position, viewport)
.max(title_interaction)
} else {
title_interaction
diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs
index 9d2f63db..a7fef37b 100644
--- a/native/src/widget/pick_list.rs
+++ b/native/src/widget/pick_list.rs
@@ -329,8 +329,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index eb732dc3..7d39c526 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -207,8 +207,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer
diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs
index af83f106..6fe3284b 100644
--- a/native/src/widget/row.rs
+++ b/native/src/widget/row.rs
@@ -166,8 +166,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- viewport: &Rectangle,
cursor_position: Point,
+ viewport: &Rectangle,
) -> mouse::Interaction {
self.children
.iter()
@@ -175,8 +175,8 @@ where
.map(|(child, layout)| {
child.widget.mouse_interaction(
layout,
- viewport,
cursor_position,
+ viewport,
)
})
.max()
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 05e9b347..00f80bc6 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -426,8 +426,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
let bounds = layout.bounds();
let content_layout = layout.children().next().unwrap();
@@ -453,11 +453,11 @@ where
self.content.mouse_interaction(
content_layout,
+ cursor_position,
&Rectangle {
y: bounds.y + offset as f32,
..bounds
},
- cursor_position,
)
}
}
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index ee9db6cf..01053081 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -342,8 +342,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 5dd68f81..db60b553 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -759,8 +759,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Text
diff --git a/native/src/widget/toggler.rs b/native/src/widget/toggler.rs
index fb7d2642..78e3d5ef 100644
--- a/native/src/widget/toggler.rs
+++ b/native/src/widget/toggler.rs
@@ -194,8 +194,8 @@ where
fn mouse_interaction(
&self,
layout: Layout<'_>,
- _viewport: &Rectangle,
cursor_position: Point,
+ _viewport: &Rectangle,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer
diff --git a/native/src/widget/tooltip.rs b/native/src/widget/tooltip.rs
index 5a6cd923..c35005e0 100644
--- a/native/src/widget/tooltip.rs
+++ b/native/src/widget/tooltip.rs
@@ -5,6 +5,7 @@ use iced_core::Rectangle;
use crate::event;
use crate::layout;
+use crate::mouse;
use crate::renderer;
use crate::text;
use crate::widget::container;
@@ -141,6 +142,16 @@ where
)
}
+ fn mouse_interaction(
+ &self,
+ layout: Layout<'_>,
+ cursor_position: Point,
+ viewport: &Rectangle,
+ ) -> mouse::Interaction {
+ self.content
+ .mouse_interaction(layout, cursor_position, viewport)
+ }
+
fn draw(
&self,
renderer: &mut Renderer,
generated by cgit (git 2.34.1) at 2025-10-28 09:31:52 +0000