From 8c373cd497e370d356b480380482779397bdb510 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 25 Feb 2023 15:38:25 +0100 Subject: Scaffold `iced_tiny_skia` and connect it to `iced_renderer` --- tiny_skia/Cargo.toml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tiny_skia/Cargo.toml (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml new file mode 100644 index 00000000..7f4b0f8c --- /dev/null +++ b/tiny_skia/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "iced_tiny_skia" +version = "0.1.0" +edition = "2021" + +[features] +image = [] +svg = [] + +[dependencies] +raw-window-handle = "0.5" +softbuffer = "0.2" +tiny-skia = "0.8" + +[dependencies.iced_native] +version = "0.9" +path = "../native" + +[dependencies.iced_graphics] +version = "0.7" +path = "../graphics" -- cgit From 744f3028f484c44899fed56d9190387569828a95 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 26 Feb 2023 00:49:27 +0100 Subject: Use `Surface::buffer` directly for drawing in `iced_tiny_skia` ... with a nice little color trick :^) --- tiny_skia/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 7f4b0f8c..70b1f5e7 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -11,6 +11,7 @@ svg = [] raw-window-handle = "0.5" softbuffer = "0.2" tiny-skia = "0.8" +bytemuck = "1" [dependencies.iced_native] version = "0.9" -- cgit From 64fb722dfe8769d4a92edb0133f1863383ecfd86 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 26 Feb 2023 23:40:17 +0100 Subject: Draft text support in `iced_tiny_skia` --- tiny_skia/Cargo.toml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 70b1f5e7..55f7f5b7 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -12,6 +12,8 @@ raw-window-handle = "0.5" softbuffer = "0.2" tiny-skia = "0.8" bytemuck = "1" +rustc-hash = "1.1" +ouroboros = "0.15" [dependencies.iced_native] version = "0.9" @@ -20,3 +22,16 @@ path = "../native" [dependencies.iced_graphics] version = "0.7" path = "../graphics" + +[dependencies.cosmic-text] +features = ["std", "swash"] +git = "https://github.com/hecrj/cosmic-text" +rev = "dc83efbf00a2efb4118403538e8a47bfd69c3e5e" + +[dependencies.twox-hash] +version = "1.6" +default-features = false + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash] +version = "1.6.1" +features = ["std"] -- cgit From 37ce30f360ce7cba9ad05654e1faf26276a1dc17 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 27 Feb 2023 02:58:02 +0100 Subject: Use `kurbo` to approximate arcs in `iced_tiny_skia` --- tiny_skia/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 55f7f5b7..7fee49cb 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -14,6 +14,7 @@ tiny-skia = "0.8" bytemuck = "1" rustc-hash = "1.1" ouroboros = "0.15" +kurbo = "0.9" [dependencies.iced_native] version = "0.9" -- cgit From c1ff803b8f98beb2a73bb4252b34921110aa6cf0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 27 Feb 2023 16:28:19 +0100 Subject: Implement basic glyph cache in `iced_tiny_skia` --- tiny_skia/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 7fee49cb..781e7d34 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -27,7 +27,7 @@ path = "../graphics" [dependencies.cosmic-text] features = ["std", "swash"] git = "https://github.com/hecrj/cosmic-text" -rev = "dc83efbf00a2efb4118403538e8a47bfd69c3e5e" +rev = "81080c1b9498933b43c1889601a7ea6a3d16e161" [dependencies.twox-hash] version = "1.6" -- cgit From 5fd5d1cdf8e5354788dc40729c4565ef377d3bba Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 1 Mar 2023 21:34:26 +0100 Subject: Implement `Canvas` support for `iced_tiny_skia` --- tiny_skia/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 781e7d34..5f39fce2 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [features] image = [] svg = [] +canvas = ["iced_native/canvas"] [dependencies] raw-window-handle = "0.5" -- cgit From bbeaf10c04a922af5c1c3b898f0c4301d23feab0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 3 Mar 2023 03:55:07 +0100 Subject: Mark `Primitive` as `non-exhaustive` in `iced_graphics` --- tiny_skia/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 5f39fce2..72181735 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -24,6 +24,7 @@ path = "../native" [dependencies.iced_graphics] version = "0.7" path = "../graphics" +features = ["tiny-skia"] [dependencies.cosmic-text] features = ["std", "swash"] -- cgit From 6cc48b5c62bac287b8f9f1c79c1fb7486c51b18f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 3 Mar 2023 04:57:55 +0100 Subject: Move `Canvas` and `QRCode` to `iced` crate Rename `canvas` modules to `geometry` in graphics subcrates --- tiny_skia/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 72181735..c4c36aba 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [features] image = [] svg = [] -canvas = ["iced_native/canvas"] +geometry = ["iced_graphics/geometry"] [dependencies] raw-window-handle = "0.5" -- cgit From 99e0a71504456976ba88040f5d1d3bbc347694ea Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 5 Mar 2023 06:35:20 +0100 Subject: Rename `iced_native` to `iced_runtime` --- tiny_skia/Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index c4c36aba..08e79bb8 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -17,10 +17,6 @@ rustc-hash = "1.1" ouroboros = "0.15" kurbo = "0.9" -[dependencies.iced_native] -version = "0.9" -path = "../native" - [dependencies.iced_graphics] version = "0.7" path = "../graphics" -- cgit From bb49e17cabd45f3a21af98b4c5ecdddd507fd427 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 7 Mar 2023 05:06:26 +0100 Subject: Implement `raster` pipeline in `iced_tiny_skia` --- tiny_skia/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 08e79bb8..647ec12a 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [features] -image = [] +image = ["iced_graphics/image"] svg = [] geometry = ["iced_graphics/geometry"] -- cgit From 5b3977daf6df624ca5d5e1a21ce282161234b22d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 7 Mar 2023 06:09:51 +0100 Subject: Implement `vector` pipeline in `iced_tiny_skia` --- tiny_skia/Cargo.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 647ec12a..69197589 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [features] image = ["iced_graphics/image"] -svg = [] +svg = ["resvg"] geometry = ["iced_graphics/geometry"] [dependencies] @@ -34,3 +34,7 @@ default-features = false [target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash] version = "1.6.1" features = ["std"] + +[dependencies.resvg] +version = "0.29" +optional = true -- cgit From 5f9e7f6cb99467363d691086cb697b2390793afd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 19 Mar 2023 14:52:30 +0100 Subject: Update `cosmic-text` to latest :tada: --- tiny_skia/Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 69197589..31f5cb6b 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -14,7 +14,6 @@ softbuffer = "0.2" tiny-skia = "0.8" bytemuck = "1" rustc-hash = "1.1" -ouroboros = "0.15" kurbo = "0.9" [dependencies.iced_graphics] @@ -24,8 +23,8 @@ features = ["tiny-skia"] [dependencies.cosmic-text] features = ["std", "swash"] -git = "https://github.com/hecrj/cosmic-text" -rev = "81080c1b9498933b43c1889601a7ea6a3d16e161" +git = "https://github.com/pop-os/cosmic-text" +rev = "e788c175ec31094b04dcacbc0537dba4433afcfc" [dependencies.twox-hash] version = "1.6" -- cgit From 04c0ba04bf8574acdcbd5ad9fa20ac9c863f6087 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 4 Apr 2023 01:47:18 +0200 Subject: Warn about invalid paths in `iced_tiny_skia` instead of panicking --- tiny_skia/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 31f5cb6b..349f6903 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -15,6 +15,7 @@ tiny-skia = "0.8" bytemuck = "1" rustc-hash = "1.1" kurbo = "0.9" +log = "0.4" [dependencies.iced_graphics] version = "0.7" -- cgit From c0431aedd3bbef4161456f2fa5f29866e8f17fc5 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 8 Apr 2023 04:47:05 +0200 Subject: Update `wgpu` and `cosmic-text` --- tiny_skia/Cargo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 349f6903..7a5f5b17 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry"] raw-window-handle = "0.5" softbuffer = "0.2" tiny-skia = "0.8" +cosmic-text = "0.8" bytemuck = "1" rustc-hash = "1.1" kurbo = "0.9" @@ -22,11 +23,6 @@ version = "0.7" path = "../graphics" features = ["tiny-skia"] -[dependencies.cosmic-text] -features = ["std", "swash"] -git = "https://github.com/pop-os/cosmic-text" -rev = "e788c175ec31094b04dcacbc0537dba4433afcfc" - [dependencies.twox-hash] version = "1.6" default-features = false -- cgit From 16e6efe020e75d51958875fa198196534679af8d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 8 Apr 2023 05:58:27 +0200 Subject: Use `pixels` for presentation in `iced_tiny_skia` when possible --- tiny_skia/Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 7a5f5b17..731e06de 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" edition = "2021" [features] +default = ["gpu"] +gpu = ["pixels"] image = ["iced_graphics/image"] svg = ["resvg"] geometry = ["iced_graphics/geometry"] @@ -31,6 +33,10 @@ default-features = false version = "1.6.1" features = ["std"] +[dependencies.pixels] +version = "0.12" +optional = true + [dependencies.resvg] version = "0.29" optional = true -- cgit From 435b54e57ecdaf08b1f36626f0000438895c909d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 26 Apr 2023 16:09:36 +0200 Subject: Revert "Use `pixels` for presentation in `iced_tiny_skia` when possible" This reverts commit 16e6efe020e75d51958875fa198196534679af8d. --- tiny_skia/Cargo.toml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index a8342e5f..f629dab9 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -4,8 +4,6 @@ version = "0.1.0" edition = "2021" [features] -default = ["gpu"] -gpu = ["pixels"] image = ["iced_graphics/image"] svg = ["resvg"] geometry = ["iced_graphics/geometry"] @@ -33,10 +31,6 @@ default-features = false version = "1.6.1" features = ["std"] -[dependencies.pixels] -version = "0.12" -optional = true - [dependencies.resvg] version = "0.29" optional = true -- cgit From 9c63eb7df559e58b14188b4096e9bd206444bbf3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 26 Apr 2023 16:46:27 +0200 Subject: Update `tiny-skia` and `resvg` --- tiny_skia/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index f629dab9..a3bddc93 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -11,7 +11,7 @@ geometry = ["iced_graphics/geometry"] [dependencies] raw-window-handle = "0.5" softbuffer = "0.2" -tiny-skia = "0.8" +tiny-skia = "0.9" cosmic-text = "0.8" bytemuck = "1" rustc-hash = "1.1" @@ -32,5 +32,5 @@ version = "1.6.1" features = ["std"] [dependencies.resvg] -version = "0.29" +version = "0.32" optional = true -- cgit From 33b5a900197e2798a393d6d9a0834039666eddbb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 19 Apr 2023 01:19:56 +0200 Subject: Make basic text shaping the default shaping strategy --- tiny_skia/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index a3bddc93..32645ac1 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -12,7 +12,6 @@ geometry = ["iced_graphics/geometry"] raw-window-handle = "0.5" softbuffer = "0.2" tiny-skia = "0.9" -cosmic-text = "0.8" bytemuck = "1" rustc-hash = "1.1" kurbo = "0.9" @@ -23,6 +22,10 @@ version = "0.8" path = "../graphics" features = ["tiny-skia"] +[dependencies.cosmic-text] +git = "https://github.com/hecrj/cosmic-text.git" +rev = "ad111a1df10d5da503620f4b841de5d41ebd4e73" + [dependencies.twox-hash] version = "1.6" default-features = false -- cgit From edf3432bf5176be13437b9fd5d25b890ec9dbe69 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 2 May 2023 00:58:33 +0200 Subject: Update `glyphon` and `cosmic-text` --- tiny_skia/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 32645ac1..400eee6a 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -24,7 +24,7 @@ features = ["tiny-skia"] [dependencies.cosmic-text] git = "https://github.com/hecrj/cosmic-text.git" -rev = "ad111a1df10d5da503620f4b841de5d41ebd4e73" +rev = "b85d6a4f2376f8a8a7dadc0f8bcb89d4db10a1c9" [dependencies.twox-hash] version = "1.6" -- cgit