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

Improvement: Simple structure of FontBook #5141

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improvement: Simple structure of FontBook #5141

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
713f71a
Update font_book.rs
rustbasic Sep 20, 2024
b71e2ef
Update font_book.rs
rustbasic Sep 20, 2024
647c4f0
Update font_book.rs
rustbasic Nov 2, 2024
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
21 changes: 9 additions & 12 deletions crates/egui_demo_lib/src/demo/font_book.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ impl crate::View for FontBook {
ui.add(crate::egui_github_link_file!());
});

let available_glyphs = self
.available_glyphs
.entry(self.font_id.family.clone())
.or_insert_with(|| available_characters(ui, &self.font_id));

ui.label(format!(
"The selected font supports {} characters.",
self.available_glyphs
.get(&self.font_id.family)
.map(|map| map.len())
.unwrap_or_default()
available_glyphs.len()
));

ui.horizontal_wrapped(|ui| {
Expand All @@ -67,17 +69,12 @@ impl crate::View for FontBook {
ui.horizontal(|ui| {
ui.label("Filter:");
ui.add(egui::TextEdit::singleline(&mut self.filter).desired_width(120.0));
self.filter = self.filter.to_lowercase();
if ui.button("ｘ").clicked() {
self.filter.clear();
}
});

let filter = &self.filter;
let available_glyphs = self
.available_glyphs
.entry(self.font_id.family.clone())
.or_insert_with(|| available_characters(ui, self.font_id.family.clone()));

ui.separator();

Expand Down Expand Up @@ -105,7 +102,7 @@ impl crate::View for FontBook {
));
};

if ui.add(button).on_hover_ui(tooltip_ui).clicked() {
if ui.add(button).on_hover_ui_at_pointer(tooltip_ui).clicked() {
ui.ctx().copy_text(chr.to_string());
}
}
Expand All @@ -115,11 +112,11 @@ impl crate::View for FontBook {
}
}

fn available_characters(ui: &egui::Ui, family: egui::FontFamily) -> BTreeMap<char, GlyphInfo> {
fn available_characters(ui: &egui::Ui, font_id: &egui::FontId) -> BTreeMap<char, GlyphInfo> {
ui.fonts(|f| {
f.lock()
.fonts
.font(&egui::FontId::new(10.0, family)) // size is arbitrary for getting the characters
.font(font_id)
.characters()
.iter()
.filter(|(chr, _fonts)| !chr.is_whitespace() && !chr.is_ascii_control())
Expand Down
Loading