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

Use closure internally to fetch graphics_info

Browse source
This commit is contained in:
Richard 2022-04-27 15:40:29 -03:00
parent 8643fbef90
commit 6e167675d6
3 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
glutin/src/application.rs
View file

@ -130,7 +130,7 @@ where
&mut clipboard, &mut clipboard,
&mut proxy, &mut proxy,
context.window(), context.window(),
&compositor.fetch_information(), || compositor.fetch_information(),
); );
runtime.track(subscription); runtime.track(subscription);
@ -209,7 +209,6 @@ async fn run_instance<A, E, C>(
let mut state = application::State::new(&application, context.window()); let mut state = application::State::new(&application, context.window());
let mut viewport_version = state.viewport_version(); let mut viewport_version = state.viewport_version();
let graphics_info = compositor.fetch_information();
let mut user_interface = let mut user_interface =
ManuallyDrop::new(application::build_user_interface( ManuallyDrop::new(application::build_user_interface(
&mut application, &mut application,
@ -266,7 +265,7 @@ async fn run_instance<A, E, C>(
&mut debug, &mut debug,
&mut messages, &mut messages,
context.window(), context.window(),
&graphics_info, || compositor.fetch_information(),
); );
// Update window // Update window

12
winit/src/application.rs
View file

@ -176,7 +176,7 @@ where
&mut clipboard, &mut clipboard,
&mut proxy, &mut proxy,
&window, &window,
&compositor.fetch_information(), || compositor.fetch_information(),
); );
runtime.track(subscription); runtime.track(subscription);
@ -264,8 +264,6 @@ async fn run_instance<A, E, C>(
physical_size.height, physical_size.height,
); );
let graphics_info = compositor.fetch_information();
let mut user_interface = ManuallyDrop::new(build_user_interface( let mut user_interface = ManuallyDrop::new(build_user_interface(
&mut application, &mut application,
user_interface::Cache::default(), user_interface::Cache::default(),
@ -321,7 +319,7 @@ async fn run_instance<A, E, C>(
&mut debug, &mut debug,
&mut messages, &mut messages,
&window, &window,
&graphics_info, || compositor.fetch_information(),
); );
// Update window // Update window
@ -521,7 +519,7 @@ pub fn update<A: Application, E: Executor>(
debug: &mut Debug, debug: &mut Debug,
messages: &mut Vec<A::Message>, messages: &mut Vec<A::Message>,
window: &winit::window::Window, window: &winit::window::Window,
graphics_info: &compositor::Information, graphics_info: impl FnOnce() -> compositor::Information + Copy,
) { ) {
for message in messages.drain(..) { for message in messages.drain(..) {
debug.log_message(&message); debug.log_message(&message);
@ -544,7 +542,7 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
clipboard: &mut Clipboard, clipboard: &mut Clipboard,
proxy: &mut winit::event_loop::EventLoopProxy<Message>, proxy: &mut winit::event_loop::EventLoopProxy<Message>,
window: &winit::window::Window, window: &winit::window::Window,
graphics_info: &compositor::Information, graphics_info: impl FnOnce() -> compositor::Information + Copy,
) { ) {
use iced_native::command; use iced_native::command;
use iced_native::system; use iced_native::system;
@ -584,7 +582,7 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
command::Action::System(action) => match action { command::Action::System(action) => match action {
system::Action::QueryInformation(tag) => { system::Action::QueryInformation(tag) => {
let information = let information =
crate::system::get_information(graphics_info); crate::system::get_information(graphics_info());
let message = tag(information); let message = tag(information);

8
winit/src/system.rs
View file

@ -17,7 +17,7 @@ pub fn fetch_information<Message>(
#[cfg(feature = "sysinfo")] #[cfg(feature = "sysinfo")]
pub(crate) fn get_information( pub(crate) fn get_information(
graphics_info: &compositor::Information, graphics_info: compositor::Information,
) -> Option<Information> { ) -> Option<Information> {
use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt}; use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt};
let mut system = System::new_all(); let mut system = System::new_all();
@ -38,8 +38,8 @@ pub(crate) fn get_information(
cpu_cores: system.physical_core_count(), cpu_cores: system.physical_core_count(),
memory_total: system.total_memory(), memory_total: system.total_memory(),
memory_used, memory_used,
graphics_adapter: graphics_info.adapter.clone(), graphics_adapter: graphics_info.adapter,
graphics_backend: graphics_info.backend.clone(), graphics_backend: graphics_info.backend,
}; };
Some(information) Some(information)
@ -47,7 +47,7 @@ pub(crate) fn get_information(
#[cfg(not(feature = "sysinfo"))] #[cfg(not(feature = "sysinfo"))]
pub(crate) fn get_information( pub(crate) fn get_information(
_graphics_info: &compositor::Information, _graphics_info: compositor::Information,
) -> Option<Information> { ) -> Option<Information> {
None None
} }