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

Update Font not found error message to include path #310

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

Update Font not found error message to include path #310

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3637346
export colors mods separately to aid precise imports
funnisimo Aug 23, 2022
f74a2a8
use updated bracket-color
funnisimo Aug 23, 2022
617639c
merge remote
funnisimo Oct 12, 2022
3bd7855
updated font not found error message
funnisimo Oct 14, 2022
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
6 changes: 4 additions & 2 deletions bracket-terminal/src/hal/gl_common/font.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ impl Font {

fn load_image(filename: &str) -> image::DynamicImage {
let resource = EMBED.lock().get_resource(filename.to_string());
let path = std::path::Path::new(filename);
match resource {
None => image::open(std::path::Path::new(&filename.to_string()))
.expect("Failed to load texture"),
None => {
image::open(path).expect(format!("Failed to load texture - {:?}", path).as_ref())
}
Some(res) => image::load_from_memory(res).expect("Failed to load texture from memory"),
}
}
Expand Down