migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 21:00:03 -04:00
Code Activity

Merge branch 'emilk:master' into cache_galley_lines

Browse Source
This commit is contained in:
Hubert Głuchowski
2024-12-07 18:44:48 +01:00
committed by GitHub
parent 17a5f1f75e 046034f902
commit c094ee8a15
97 changed files with 1368 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/epaint/src/mutex.rs
View File

@@ -75,7 +75,7 @@ mod mutex_impl {
// Detect if we are recursively taking out a lock on this mutex.
// use a pointer to the inner data as an id for this lock
let ptr = (&self.0 as *const parking_lot::Mutex<_>).cast::<()>();
let ptr = std::ptr::from_ref::<parking_lot::Mutex<_>>(&self.0).cast::<()>();
// Store it in thread local storage while we have a lock guard taken out
HELD_LOCKS_TLS.with(|held_locks| {

4
crates/epaint/src/text/text_layout_types.rs
View File

@@ -648,10 +648,10 @@ pub struct Glyph {
/// The row/line height of this font.
pub font_height: f32,
/// The ascent of the sub-font within the font ("FontImpl").
/// The ascent of the sub-font within the font (`FontImpl`).
pub font_impl_ascent: f32,
/// The row/line height of the sub-font within the font ("FontImpl").
/// The row/line height of the sub-font within the font (`FontImpl`).
pub font_impl_height: f32,
/// Position and size of the glyph in the font texture, in texels.