mirror of
https://github.com/emilk/egui.git
synced 2026-08-29 21:00:03 -04:00
Merge branch 'master' into cache_galley_lines
This commit is contained in:
@@ -64,8 +64,7 @@ pub fn adjust_colors(
|
||||
fill,
|
||||
stroke,
|
||||
blur_width: _,
|
||||
fill_texture_id: _,
|
||||
uv: _,
|
||||
brush: _,
|
||||
}) => {
|
||||
adjust_color(fill);
|
||||
adjust_color(&mut stroke.color);
|
||||
@@ -87,7 +86,7 @@ pub fn adjust_colors(
|
||||
}
|
||||
|
||||
if !galley.is_empty() {
|
||||
let galley = std::sync::Arc::make_mut(galley);
|
||||
let galley = Arc::make_mut(galley);
|
||||
for placed_row in &mut galley.rows {
|
||||
let row = Arc::make_mut(&mut placed_row.row);
|
||||
for vertex in &mut row.visuals.mesh.vertices {
|
||||
@@ -97,11 +96,13 @@ pub fn adjust_colors(
|
||||
}
|
||||
}
|
||||
|
||||
Shape::Mesh(Mesh {
|
||||
indices: _,
|
||||
vertices,
|
||||
texture_id: _,
|
||||
}) => {
|
||||
Shape::Mesh(mesh) => {
|
||||
let Mesh {
|
||||
indices: _,
|
||||
vertices,
|
||||
texture_id: _,
|
||||
} = Arc::make_mut(mesh);
|
||||
|
||||
for v in vertices {
|
||||
adjust_color(&mut v.color);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user