Skip to content
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.

Sign up for GitHub

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

Fix rounding of ImageButton #3531

Merged
merged 5 commits into from
Nov 10, 2023
Merged

Fix rounding of ImageButton #3531

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7bf769
ImageButton rounding fix
chriscate Nov 5, 2023
90bdfbc
remove unnecessary struct creation
chriscate Nov 5, 2023
5ca68f5
added rounding method for ImageButton
chriscate Nov 6, 2023
5cd8faa
grammar fix
chriscate Nov 6, 2023
78fd2ab
simplify the code slightly
emilk Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions crates/egui/src/widgets/button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,14 @@ impl<'a> ImageButton<'a> {
self.sense = sense;
self
}

/// Set rounding for the `ImageButton`.
/// If the underlying image already has rounding, this
/// will override that value.
pub fn rounding(mut self, rounding: impl Into<Rounding>) -> Self {
self.image = self.image.rounding(rounding.into());
self
}
}

impl<'a> Widget for ImageButton<'a> {
Expand Down Expand Up @@ -621,7 +629,7 @@ impl<'a> Widget for ImageButton<'a> {
let selection = ui.visuals().selection;
(
Vec2::ZERO,
Rounding::ZERO,
self.image.image_options().rounding,
selection.bg_fill,
selection.stroke,
)
Expand All @@ -630,7 +638,7 @@ impl<'a> Widget for ImageButton<'a> {
let expansion = Vec2::splat(visuals.expansion);
(
expansion,
visuals.rounding,
self.image.image_options().rounding,
visuals.weak_bg_fill,
visuals.bg_stroke,
)
Expand All @@ -646,10 +654,8 @@ impl<'a> Widget for ImageButton<'a> {
.layout()
.align_size_within_rect(image_size, rect.shrink2(padding));
// let image_rect = image_rect.expand2(expansion); // can make it blurry, so let's not
let image_options = ImageOptions {
rounding, // apply rounding to the image
..self.image.image_options().clone()
};
let image_options = self.image.image_options().clone();

widgets::image::paint_texture_load_result(ui, &tlr, image_rect, None, &image_options);

// Draw frame outline:
Expand Down