-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(manganis): add with_width/with_height for auto aspect-ratio image sizing #5606
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
theonlyhennygod
wants to merge
1
commit into
DioxusLabs:main
Choose a base branch
from
theonlyhennygod:feat/auto-width-height-image
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+58
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,16 @@ pub enum ImageSize { | |
| /// The height of the image in pixels | ||
| height: u32, | ||
| }, | ||
| /// Only the width is specified; the height will be derived from the image's aspect ratio | ||
| WidthOnly { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we now support any combination, the struct can be width: Option, height: Option now with methods to create different variants |
||
| /// The width of the image in pixels | ||
| width: u32, | ||
| }, | ||
| /// Only the height is specified; the width will be derived from the image's aspect ratio | ||
| HeightOnly { | ||
| /// The height of the image in pixels | ||
| height: u32, | ||
| }, | ||
| /// The size will be automatically determined from the image source | ||
| Automatic, | ||
| } | ||
|
|
@@ -225,6 +235,36 @@ impl AssetOptionsBuilder<ImageAssetOptions> { | |
| self | ||
| } | ||
|
|
||
| /// Sets the width of the image and derives the height from the aspect ratio | ||
| /// | ||
| /// This is useful when you want to resize an image to a specific width but maintain | ||
| /// its original aspect ratio. The height will be computed at build time from the | ||
| /// actual image dimensions. | ||
| /// | ||
| /// ```rust | ||
| /// # use manganis::{asset, Asset, AssetOptions}; | ||
| /// const _: Asset = asset!("/assets/image.png", AssetOptions::image().with_width(52)); | ||
| /// ``` | ||
| pub const fn with_width(mut self, width: u32) -> Self { | ||
| self.variant.size = ImageSize::WidthOnly { width }; | ||
| self | ||
| } | ||
|
|
||
| /// Sets the height of the image and derives the width from the aspect ratio | ||
| /// | ||
| /// This is useful when you want to resize an image to a specific height but maintain | ||
| /// its original aspect ratio. The width will be computed at build time from the | ||
| /// actual image dimensions. | ||
| /// | ||
| /// ```rust | ||
| /// # use manganis::{asset, Asset, AssetOptions}; | ||
| /// const _: Asset = asset!("/assets/image.png", AssetOptions::image().with_height(52)); | ||
| /// ``` | ||
| pub const fn with_height(mut self, height: u32) -> Self { | ||
| self.variant.size = ImageSize::HeightOnly { height }; | ||
| self | ||
| } | ||
|
|
||
| /// Convert the options into options for a generic asset | ||
| pub const fn into_asset_options(self) -> AssetOptions { | ||
| AssetOptions { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changing to optional fields simplifies this logic to manual_dim.unwrap_or_else(existing_dim)