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

Draft first-class Theme support

Browse source 
RFC: https://github.com/iced-rs/rfcs/pull/6
This commit is contained in:
Héctor Ramón Jiménez 2022-05-14 01:47:55 +02:00
parent 5de337f214
commit 664251f3f5
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
113 changed files with 767 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

19
winit/src/application.rs
View file

@ -51,6 +51,9 @@ pub trait Application: Program {
/// title of your application when necessary.
fn title(&self) -> String;
/// Returns the current [`Theme`] of the [`Application`].
fn theme(&self) -> <Self::Renderer as iced_native::Renderer>::Theme;
/// Returns the event `Subscription` for the current state of the
/// application.
///
@ -255,6 +258,7 @@ async fn run_instance<A, E, C>(
let mut state = State::new(&application, &window);
let mut viewport_version = state.viewport_version();
let mut theme = application.theme();
let physical_size = state.physical_size();
@ -327,6 +331,7 @@ async fn run_instance<A, E, C>(
let should_exit = application.should_exit();
theme = application.theme();
user_interface = ManuallyDrop::new(build_user_interface(
&mut application,
cache,
@ -341,8 +346,11 @@ async fn run_instance<A, E, C>(
}
debug.draw_started();
let new_mouse_interaction =
user_interface.draw(&mut renderer, state.cursor_position());
let new_mouse_interaction = user_interface.draw(
&mut renderer,
&theme,
state.cursor_position(),
);
debug.draw_finished();
if new_mouse_interaction != mouse_interaction {
@ -389,8 +397,11 @@ async fn run_instance<A, E, C>(
debug.layout_finished();
debug.draw_started();
let new_mouse_interaction = user_interface
.draw(&mut renderer, state.cursor_position());
let new_mouse_interaction = user_interface.draw(
&mut renderer,
&theme,
state.cursor_position(),
);
if new_mouse_interaction != mouse_interaction {
window.set_cursor_icon(conversion::mouse_interaction(