djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix custom font definitions getting replaced when pixels_per_point is changed (#564)

Browse source 
- This bug is most noticable when default fonts are disabled.
This commit is contained in:
Jay Oster 2021-07-20 05:06:27 -07:00 committed by GitHub
parent 7c5a2d60c5
commit a9c004d16b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -13,6 +13,9 @@ NOTE: [`eframe`](eframe/CHANGELOG.md), [`egui_web`](egui_web/CHANGELOG.md) and [
* [Progress bar](https://github.com/emilk/egui/pull/519) * [Progress bar](https://github.com/emilk/egui/pull/519)
* `Grid::num_columns`: allow the last column to take up the rest of the space of the parent `Ui`. * `Grid::num_columns`: allow the last column to take up the rest of the space of the parent `Ui`.
### Fixed 🐛
* Fix custom font definitions getting replaced when `pixels_per_point` is changed.
## 0.13.1 - 2021-06-28 - Plot fixes ## 0.13.1 - 2021-06-28 - Plot fixes

7
egui/src/context.rs
View file

@ -578,7 +578,12 @@ impl Context {
if self.fonts.is_none() || new_font_definitions.is_some() || pixels_per_point_changed { if self.fonts.is_none() || new_font_definitions.is_some() || pixels_per_point_changed {
self.fonts = Some(Arc::new(Fonts::from_definitions( self.fonts = Some(Arc::new(Fonts::from_definitions(
pixels_per_point, pixels_per_point,
new_font_definitions.unwrap_or_default(), new_font_definitions.unwrap_or_else(|| {
self.fonts
.as_ref()
.map(|font| font.definitions().clone())
.unwrap_or_default()
}),
))); )));
} }
} }