diff options
author | 2023-02-17 11:45:34 -0800 | |
---|---|---|
committer | 2023-02-17 11:45:34 -0800 | |
commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /core/src/lib.rs | |
parent | 8da098330b58542cc929f4f24d02e26bd654bae4 (diff) | |
parent | 7dc1fb488ddbd12519571b51d75ae0c28875911d (diff) | |
download | iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.gz iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.bz2 iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.zip |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# winit/src/window.rs
Diffstat (limited to 'core/src/lib.rs')
-rw-r--r-- | core/src/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/src/lib.rs b/core/src/lib.rs index 3aa5defe..31280a05 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -35,6 +35,7 @@ mod content_fit; mod font; mod length; mod padding; +mod pixels; mod point; mod rectangle; mod size; @@ -47,6 +48,7 @@ pub use content_fit::ContentFit; pub use font::Font; pub use length::Length; pub use padding::Padding; +pub use pixels::Pixels; pub use point::Point; pub use rectangle::Rectangle; pub use size::Size; |