skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small clippy fixes (#7566)

This commit is contained in:
Emil Ernerfeldt 2025-09-27 12:14:47 +02:00 committed by GitHub
parent 472437a510
commit 4683d91653
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/egui/src/menu.rs
View File

@ -445,12 +445,13 @@ impl MenuRoot {
response.ctx.input(|input| { response.ctx.input(|input| {
let pointer = &input.pointer; let pointer = &input.pointer;
if let Some(pos) = pointer.interact_pos() { if let Some(pos) = pointer.interact_pos() {
let mut in_old_menu = false; let (in_old_menu, destroy) = if let Some(root) = root {
let mut destroy = false; let in_old_menu = root.menu_state.read().area_contains(pos);
if let Some(root) = root { let destroy = !in_old_menu && pointer.any_pressed() && root.id == response.id;
in_old_menu = root.menu_state.read().area_contains(pos); (in_old_menu, destroy)
destroy = !in_old_menu && pointer.any_pressed() && root.id == response.id; } else {
} (false, false)
};
if !in_old_menu { if !in_old_menu {
if hovered && secondary_clicked { if hovered && secondary_clicked {
return MenuResponse::Create(pos, response.id); return MenuResponse::Create(pos, response.id);

14
crates/egui/src/widget_text.rs
View File

@ -404,15 +404,11 @@ impl RichText {
let text_color = text_color.unwrap_or(crate::Color32::PLACEHOLDER); let text_color = text_color.unwrap_or(crate::Color32::PLACEHOLDER);
let font_id = { let font_id = {
let mut font_id = text_style let mut font_id = style.override_font_id.clone().unwrap_or_else(|| {
.or_else(|| style.override_text_style.clone()) (text_style.as_ref().or(style.override_text_style.as_ref()))
.map_or_else( .map(|text_style| text_style.resolve(style))
|| fallback_font.resolve(style), .unwrap_or_else(|| fallback_font.resolve(style))
|text_style| text_style.resolve(style), });
);
if let Some(fid) = style.override_font_id.clone() {
font_id = fid;
}
if let Some(size) = size { if let Some(size) = size {
font_id.size = size; font_id.size = size;
} }