summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-09 22:25:16 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-09 22:25:16 +0200
commit6ad5bb3597f640ac329801adf735d633bf0a512f (patch)
treef0928edacd09d6537878d22b00ad7ed7829c9ac0 /core/src
parent2c6fd9ac14c5d270e05b97b7a7fab811d25834c4 (diff)
downloadiced-6ad5bb3597f640ac329801adf735d633bf0a512f.tar.gz
iced-6ad5bb3597f640ac329801adf735d633bf0a512f.tar.bz2
iced-6ad5bb3597f640ac329801adf735d633bf0a512f.zip
Port `iced_tiny_skia` to new layering architecture
Diffstat (limited to 'core/src')
-rw-r--r--core/src/renderer.rs8
-rw-r--r--core/src/renderer/null.rs8
-rw-r--r--core/src/text.rs4
3 files changed, 6 insertions, 14 deletions
diff --git a/core/src/renderer.rs b/core/src/renderer.rs
index f5ef8f68..a2785ae8 100644
--- a/core/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -14,7 +14,7 @@ pub trait Renderer {
/// Ends recording a new layer.
///
/// The new layer will clip its contents to the provided `bounds`.
- fn end_layer(&mut self, bounds: Rectangle);
+ fn end_layer(&mut self);
/// Draws the primitives recorded in the given closure in a new layer.
///
@@ -22,7 +22,7 @@ pub trait Renderer {
fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
self.start_layer(bounds);
f(self);
- self.end_layer(bounds);
+ self.end_layer();
}
/// Starts recording with a new [`Transformation`].
@@ -31,7 +31,7 @@ pub trait Renderer {
/// Ends recording a new layer.
///
/// The new layer will clip its contents to the provided `bounds`.
- fn end_transformation(&mut self, transformation: Transformation);
+ fn end_transformation(&mut self);
/// Applies a [`Transformation`] to the primitives recorded in the given closure.
fn with_transformation(
@@ -41,7 +41,7 @@ pub trait Renderer {
) {
self.start_transformation(transformation);
f(self);
- self.end_transformation(transformation);
+ self.end_transformation();
}
/// Applies a translation to the primitives recorded in the given closure.
diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index f36d19aa..fe38ec87 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -7,16 +7,14 @@ use crate::{
Background, Color, Font, Pixels, Point, Rectangle, Size, Transformation,
};
-use std::borrow::Cow;
-
impl Renderer for () {
fn start_layer(&mut self, _bounds: Rectangle) {}
- fn end_layer(&mut self, _bounds: Rectangle) {}
+ fn end_layer(&mut self) {}
fn start_transformation(&mut self, _transformation: Transformation) {}
- fn end_transformation(&mut self, _transformation: Transformation) {}
+ fn end_transformation(&mut self) {}
fn clear(&mut self) {}
@@ -45,8 +43,6 @@ impl text::Renderer for () {
Pixels(16.0)
}
- fn load_font(&mut self, _font: Cow<'static, [u8]>) {}
-
fn fill_paragraph(
&mut self,
_paragraph: &Self::Paragraph,
diff --git a/core/src/text.rs b/core/src/text.rs
index 3f1d2c77..b30feae0 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -11,7 +11,6 @@ pub use paragraph::Paragraph;
use crate::alignment;
use crate::{Color, Pixels, Point, Rectangle, Size};
-use std::borrow::Cow;
use std::hash::{Hash, Hasher};
/// A paragraph.
@@ -192,9 +191,6 @@ pub trait Renderer: crate::Renderer {
/// Returns the default size of [`Text`].
fn default_size(&self) -> Pixels;
- /// Loads a [`Self::Font`] from its bytes.
- fn load_font(&mut self, font: Cow<'static, [u8]>);
-
/// Draws the given [`Paragraph`] at the given position and with the given
/// [`Color`].
fn fill_paragraph(