Skip to content

Commit

Permalink
Merge pull request #2764 from iced-rs/wasm/enable-animation
Browse files Browse the repository at this point in the history
Enable `animation` module for Wasm target
  • Loading branch information
hecrj authored Jan 29, 2025
2 parents 9b959d3 + a56c2f3 commit 9606df5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ half = "2.2"
image = { version = "0.25", default-features = false }
kamadak-exif = "0.5"
kurbo = "0.10"
lilt = "0.7"
lilt = "0.8"
log = "0.4"
lyon = "1.0"
lyon_path = "1.0"
Expand Down
2 changes: 0 additions & 2 deletions core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
)]
pub mod alignment;
#[cfg(not(target_arch = "wasm32"))]
pub mod animation;
pub mod border;
pub mod clipboard;
Expand Down Expand Up @@ -51,7 +50,6 @@ mod vector;

pub use alignment::Alignment;
pub use angle::{Degrees, Radians};
#[cfg(not(target_arch = "wasm32"))]
pub use animation::Animation;
pub use background::Background;
pub use border::Border;
Expand Down
13 changes: 4 additions & 9 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -498,25 +498,20 @@ pub mod window;
pub mod advanced;

pub use crate::core::alignment;
pub use crate::core::animation;
pub use crate::core::border;
pub use crate::core::color;
pub use crate::core::gradient;
pub use crate::core::padding;
pub use crate::core::theme;
pub use crate::core::{
Alignment, Background, Border, Color, ContentFit, Degrees, Gradient,
Length, Padding, Pixels, Point, Radians, Rectangle, Rotation, Settings,
Shadow, Size, Theme, Transformation, Vector,
Alignment, Animation, Background, Border, Color, ContentFit, Degrees,
Gradient, Length, Padding, Pixels, Point, Radians, Rectangle, Rotation,
Settings, Shadow, Size, Theme, Transformation, Vector,
};
pub use crate::runtime::exit;
pub use iced_futures::Subscription;

#[cfg(not(target_arch = "wasm32"))]
pub use crate::core::animation;

#[cfg(not(target_arch = "wasm32"))]
pub use crate::core::Animation;

pub use alignment::Horizontal::{Left, Right};
pub use alignment::Vertical::{Bottom, Top};
pub use Alignment::Center;
Expand Down

0 comments on commit 9606df5

Please sign in to comment.