me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename MouseCursor to mouse::Interaction

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-04-30 08:16:38 +02:00
parent d4c4198f72
commit 98bc8cf2a7
35 changed files with 170 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

12
wgpu/src/renderer/widget/column.rs
View file

@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
use iced_native::{column, Element, Layout, MouseCursor, Point};
use iced_native::{column, mouse, Element, Layout, Point};
impl column::Renderer for Renderer {
fn draw<Message>(
@ -9,7 +9,7 @@ impl column::Renderer for Renderer {
layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output {
let mut mouse_cursor = MouseCursor::default();
let mut mouse_interaction = mouse::Interaction::default();
(
Primitive::Group {
@ -17,18 +17,18 @@ impl column::Renderer for Renderer {
.iter()
.zip(layout.children())
.map(|(child, layout)| {
let (primitive, new_mouse_cursor) =
let (primitive, new_mouse_interaction) =
child.draw(self, defaults, layout, cursor_position);
if new_mouse_cursor > mouse_cursor {
mouse_cursor = new_mouse_cursor;
if new_mouse_interaction > mouse_interaction {
mouse_interaction = new_mouse_interaction;
}
primitive
})
.collect(),
},
mouse_cursor,
mouse_interaction,
)
}
}