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

Move compositor module access from window to crate

Browse source
This commit is contained in:
Richard 2022-04-26 19:18:18 -03:00
parent 5be1ac18fe
commit 984d1f375e
8 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
winit/src/application.rs
View file

@ -13,6 +13,7 @@ use crate::{
use iced_futures::futures;
use iced_futures::futures::channel::mpsc;
use iced_graphics::compositor;
use iced_graphics::window;
use iced_native::program::Program;
use iced_native::user_interface::{self, UserInterface};
@ -426,7 +427,7 @@ async fn run_instance<A, E, C>(
}
Err(error) => match error {
// This is an unrecoverable error.
window::SurfaceError::OutOfMemory => {
compositor::SurfaceError::OutOfMemory => {
panic!("{:?}", error);
}
_ => {
@ -520,7 +521,7 @@ pub fn update<A: Application, E: Executor>(
debug: &mut Debug,
messages: &mut Vec<A::Message>,
window: &winit::window::Window,
graphics_info: &window::Information,
graphics_info: &compositor::Information,
) {
for message in messages.drain(..) {
debug.log_message(&message);
@ -543,7 +544,7 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
clipboard: &mut Clipboard,
proxy: &mut winit::event_loop::EventLoopProxy<Message>,
window: &winit::window::Window,
graphics_info: &window::Information,
graphics_info: &compositor::Information,
) {
use iced_native::command;
use iced_native::system;

6
winit/src/system.rs
View file

@ -2,7 +2,7 @@
use crate::command::{self, Command};
pub use iced_native::system::*;
use iced_graphics::window;
use iced_graphics::compositor;
/// Query for available system information.
///
@ -17,7 +17,7 @@ pub fn information<Message>(
#[cfg(feature = "sysinfo")]
pub(crate) fn get_information(
graphics_info: &window::Information,
graphics_info: &compositor::Information,
) -> Option<Information> {
use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt};
let mut system = System::new_all();
@ -47,7 +47,7 @@ pub(crate) fn get_information(
#[cfg(not(feature = "sysinfo"))]
pub(crate) fn get_information(
_graphics_info: &window::Information,
_graphics_info: &compositor::Information,
) -> Option<Information> {
None
}