summaryrefslogtreecommitdiffstats
path: root/glutin
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-10-14 16:07:22 +0700
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-10-14 16:07:22 +0700
commit03b34931383e701c39c653a7662a616fe21a0947 (patch)
tree8c0773d50b615dbc62210db8919ecb97ca912bd9 /glutin
parent3aae45c1913e6a6f60b009f19d00d10add7ad11e (diff)
downloadiced-03b34931383e701c39c653a7662a616fe21a0947.tar.gz
iced-03b34931383e701c39c653a7662a616fe21a0947.tar.bz2
iced-03b34931383e701c39c653a7662a616fe21a0947.zip
Remove trait-specific draw logic in `iced_native`
Diffstat (limited to 'glutin')
-rw-r--r--glutin/src/application.rs24
1 files changed, 6 insertions, 18 deletions
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
index fa2192d8..508dfe04 100644
--- a/glutin/src/application.rs
+++ b/glutin/src/application.rs
@@ -1,5 +1,5 @@
//! Create interactive, native cross-platform applications.
-use crate::{mouse, Error, Executor, Runtime};
+use crate::{Error, Executor, Runtime};
pub use iced_winit::Application;
@@ -179,9 +179,8 @@ async fn run_instance<A, E, C>(
&mut debug,
));
- let mut primitive =
- user_interface.draw(&mut renderer, state.cursor_position());
- let mut mouse_interaction = mouse::Interaction::default();
+ // TODO
+ // let mut mouse_interaction = mouse::Interaction::default();
let mut events = Vec::new();
let mut messages = Vec::new();
@@ -246,8 +245,7 @@ async fn run_instance<A, E, C>(
}
debug.draw_started();
- primitive =
- user_interface.draw(&mut renderer, state.cursor_position());
+ user_interface.draw(&mut renderer, state.cursor_position());
debug.draw_finished();
context.window().request_redraw();
@@ -291,8 +289,7 @@ async fn run_instance<A, E, C>(
debug.layout_finished();
debug.draw_started();
- primitive = user_interface
- .draw(&mut renderer, state.cursor_position());
+ user_interface.draw(&mut renderer, state.cursor_position());
debug.draw_finished();
context.resize(glutin::dpi::PhysicalSize::new(
@@ -305,11 +302,10 @@ async fn run_instance<A, E, C>(
viewport_version = current_viewport_version;
}
- let new_mouse_interaction = compositor.draw(
+ compositor.present(
&mut renderer,
state.viewport(),
state.background_color(),
- &primitive,
&debug.overlay(),
);
@@ -317,14 +313,6 @@ async fn run_instance<A, E, C>(
debug.render_finished();
- if new_mouse_interaction != mouse_interaction {
- context.window().set_cursor_icon(
- conversion::mouse_interaction(new_mouse_interaction),
- );
-
- mouse_interaction = new_mouse_interaction;
- }
-
// TODO: Handle animations!
// Maybe we can use `ControlFlow::WaitUntil` for this.
}