dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-05-24 12:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #174 from danbulant/image-corner-radii

Browse source 
Make images respect border radii
This commit is contained in:
Jonathan Johnson 2024-10-06 12:58:19 -07:00 committed by GitHub
commit 223989410d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/widgets/image.rs
View file

@ -1,11 +1,13 @@
//! A widget that displays an image/texture. //! A widget that displays an image/texture.
use figures::units::{Px, UPx}; use figures::units::{Px, UPx};
use figures::{FloatConversion, IntoSigned, IntoUnsigned, Point, Rect, Size, Zero}; use figures::{FloatConversion, IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size, Zero};
use kludgine::{AnyTexture, CollectedTexture, LazyTexture, SharedTexture, Texture, TextureRegion}; use kludgine::shapes::Shape;
use kludgine::{AnyTexture, CollectedTexture, Color, LazyTexture, SharedTexture, Texture, TextureRegion};
use crate::animation::ZeroToOne; use crate::animation::ZeroToOne;
use crate::context::{LayoutContext, Trackable}; use crate::context::{LayoutContext, Trackable};
use crate::styles::components::CornerRadius;
use crate::value::{IntoValue, Source, Value}; use crate::value::{IntoValue, Source, Value};
use crate::widget::Widget; use crate::widget::Widget;
use crate::ConstraintLimit; use crate::ConstraintLimit;
@ -157,9 +159,16 @@ impl Widget for Image {
fn redraw(&mut self, context: &mut crate::context::GraphicsContext<'_, '_, '_, '_>) { fn redraw(&mut self, context: &mut crate::context::GraphicsContext<'_, '_, '_, '_>) {
self.contents.invalidate_when_changed(context); self.contents.invalidate_when_changed(context);
let opacity = self.opacity.get_tracking_redraw(context); let opacity = self.opacity.get_tracking_redraw(context);
let radii = context.get(&CornerRadius);
let radii = radii.map(|r| r.into_px(context.gfx.scale()));
self.contents.map(|texture| { self.contents.map(|texture| {
let rect = self.calculate_image_rect(texture, context.gfx.size(), context); let rect = self.calculate_image_rect(texture, context.gfx.size(), context);
if radii.is_zero() {
context.gfx.draw_texture(texture, rect, opacity); context.gfx.draw_texture(texture, rect, opacity);
} else {
context.gfx.draw_textured_shape(&Shape::textured_round_rect(rect, radii, Rect::from(texture.size()), Color::WHITE), texture, opacity);
}
}); });
} }