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

Jump to bottom

Fix: button_padding when using image+text buttons #2510

Merged
merged 7 commits into from
Jan 23, 2023
Merged

Fix: button_padding when using image+text buttons #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7a0c6a
feat(image-button-margin): implement image button margin
RobWalt Dec 26, 2022
70157e3
feat(image-button-margin): update changelog
RobWalt Dec 26, 2022
1d624fa
feat(image-button-margin): implement `map_or` clippy fix
RobWalt Dec 26, 2022
ef81b60
feat(image-button-margin): remove margin field & fix button-padding i…
RobWalt Dec 28, 2022
9694af8
feat(image-button-margin): fix CI errors
RobWalt Dec 28, 2022
8572339
feat(image-button-margin): update changelog to include fix
RobWalt Dec 28, 2022
bdd12c2
feat(image-button-margin): re-add changes after creating screenshots …
RobWalt Dec 28, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ NOTE: [`epaint`](crates/epaint/CHANGELOG.md), [`eframe`](crates/eframe/CHANGELOG
### Fixed 🐛
* Expose `TextEdit`'s multiline flag to AccessKit ([#2448](https://github.com/emilk/egui/pull/2448)).
* Don't render `\r` (Carriage Return) ([#2452](https://github.com/emilk/egui/pull/2452)).
* The `button_padding` style option works closer as expected with image+text buttons now ([#2510](https://github.com/emilk/egui/pull/2510)).


## 0.20.1 - 2022-12-11 - Fix key-repeat
Expand Down
5 changes: 4 additions & 1 deletion crates/egui/src/widgets/button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ impl Widget for Button {

if let Some(image) = image {
let image_rect = Rect::from_min_size(
pos2(rect.min.x, rect.center().y - 0.5 - (image.size().y / 2.0)),
pos2(
rect.min.x + button_padding.x,
rect.center().y - 0.5 - (image.size().y / 2.0),
),
image.size(),
);
image.paint_at(ui, image_rect);
Expand Down