Skip to content

Commit 9606df5

Browse files
authored
Merge pull request #2764 from iced-rs/wasm/enable-animation
Enable `animation` module for Wasm target
2 parents 9b959d3 + a56c2f3 commit 9606df5

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ half = "2.2"
158158
image = { version = "0.25", default-features = false }
159159
kamadak-exif = "0.5"
160160
kurbo = "0.10"
161-
lilt = "0.7"
161+
lilt = "0.8"
162162
log = "0.4"
163163
lyon = "1.0"
164164
lyon_path = "1.0"

core/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
1111
)]
1212
pub mod alignment;
13-
#[cfg(not(target_arch = "wasm32"))]
1413
pub mod animation;
1514
pub mod border;
1615
pub mod clipboard;
@@ -51,7 +50,6 @@ mod vector;
5150

5251
pub use alignment::Alignment;
5352
pub use angle::{Degrees, Radians};
54-
#[cfg(not(target_arch = "wasm32"))]
5553
pub use animation::Animation;
5654
pub use background::Background;
5755
pub use border::Border;

src/lib.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -498,25 +498,20 @@ pub mod window;
498498
pub mod advanced;
499499

500500
pub use crate::core::alignment;
501+
pub use crate::core::animation;
501502
pub use crate::core::border;
502503
pub use crate::core::color;
503504
pub use crate::core::gradient;
504505
pub use crate::core::padding;
505506
pub use crate::core::theme;
506507
pub use crate::core::{
507-
Alignment, Background, Border, Color, ContentFit, Degrees, Gradient,
508-
Length, Padding, Pixels, Point, Radians, Rectangle, Rotation, Settings,
509-
Shadow, Size, Theme, Transformation, Vector,
508+
Alignment, Animation, Background, Border, Color, ContentFit, Degrees,
509+
Gradient, Length, Padding, Pixels, Point, Radians, Rectangle, Rotation,
510+
Settings, Shadow, Size, Theme, Transformation, Vector,
510511
};
511512
pub use crate::runtime::exit;
512513
pub use iced_futures::Subscription;
513514

514-
#[cfg(not(target_arch = "wasm32"))]
515-
pub use crate::core::animation;
516-
517-
#[cfg(not(target_arch = "wasm32"))]
518-
pub use crate::core::Animation;
519-
520515
pub use alignment::Horizontal::{Left, Right};
521516
pub use alignment::Vertical::{Bottom, Top};
522517
pub use Alignment::Center;

0 commit comments

Comments
 (0)