From 6ad5bb3597f640ac329801adf735d633bf0a512f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 9 Apr 2024 22:25:16 +0200
Subject: Port `iced_tiny_skia` to new layering architecture
---
winit/src/application.rs | 12 ++++--------
winit/src/multi_window.rs | 7 +------
2 files changed, 5 insertions(+), 14 deletions(-)
(limited to 'winit/src')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index d68523fa..1ca80609 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -220,13 +220,11 @@ where
};
}
- let compositor = C::new(graphics_settings, window.clone()).await?;
- let mut renderer = compositor.create_renderer();
+ let mut compositor = C::new(graphics_settings, window.clone()).await?;
+ let renderer = compositor.create_renderer();
for font in settings.fonts {
- use crate::core::text::Renderer;
-
- renderer.load_font(font);
+ compositor.load_font(font);
}
let (mut event_sender, event_receiver) = mpsc::unbounded();
@@ -950,10 +948,8 @@ pub fn run_command<A, C, E>(
*cache = current_cache;
}
command::Action::LoadFont { bytes, tagger } => {
- use crate::core::text::Renderer;
-
// TODO: Error handling (?)
- renderer.load_font(bytes);
+ compositor.load_font(bytes);
proxy
.send_event(tagger(Ok(())))
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index e17cc180..3537ac18 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -1194,13 +1194,8 @@ fn run_command<A, C, E>(
uis.drain().map(|(id, ui)| (id, ui.into_cache())).collect();
}
command::Action::LoadFont { bytes, tagger } => {
- use crate::core::text::Renderer;
-
- // TODO change this once we change each renderer to having a single backend reference.. :pain:
// TODO: Error handling (?)
- for (_, window) in window_manager.iter_mut() {
- window.renderer.load_font(bytes.clone());
- }
+ compositor.load_font(bytes.clone());
proxy
.send_event(tagger(Ok(())))
--
cgit