Track API changes. - icy_draw - icy_draw is the successor to mystic draw. fork / mirror
HTML git clone https://git.drkhsh.at/icy_draw.git
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit c89749f5fdb542355679115ff5918684ece3d784
DIR parent f83412dd04d4e1911934ee7969335594cd7908c1
HTML Author: Mike Krüger <mkrueger@posteo.de>
Date: Thu, 7 Sep 2023 19:20:04 +0200
Track API changes.
Diffstat:
M src/ui/messages.rs | 16 ++++++----------
M src/ui/tools/bitfont_selector.rs | 36 +++++++++++--------------------
2 files changed, 19 insertions(+), 33 deletions(-)
---
DIR diff --git a/src/ui/messages.rs b/src/ui/messages.rs
@@ -369,16 +369,12 @@ impl MainWindow {
let lock = &mut editor.buffer_view.lock();
let buf = &mut lock.get_buffer_mut();
if buf.get_font(page).is_none() {
- if let Some(font_name) =
- icy_engine::parsers::ansi::constants::ANSI_FONT_NAMES.get(page)
- {
- match BitFont::from_name(font_name) {
- Ok(font) => {
- buf.set_font(page, font);
- }
- Err(err) => {
- log::error!("Failed to load font: {err}");
- }
+ match BitFont::from_ansi_font_page(page) {
+ Ok(font) => {
+ buf.set_font(page, font);
+ }
+ Err(err) => {
+ log::error!("Failed to load font: {err}");
}
}
}
DIR diff --git a/src/ui/tools/bitfont_selector.rs b/src/ui/tools/bitfont_selector.rs
@@ -2,6 +2,7 @@ use std::sync::{Arc, Mutex};
use eframe::egui::{self, RichText};
use i18n_embed_fl::fl;
+use icy_engine::{ANSI_FONTS, FONT_NAMES, FONT_NAME_LEN};
use crate::{AnsiEditor, Document, Message, ToolWindow};
@@ -48,28 +49,17 @@ fn show_font_list(ui: &mut egui::Ui, editor: &AnsiEditor) -> Option<Message> {
egui::ScrollArea::vertical()
.id_source("bitfont_scroll_area")
.max_height(300.)
- .show_rows(
- ui,
- row_height,
- icy_engine::parsers::ansi::constants::ANSI_FONT_NAMES.len(),
- |ui, range| {
- for r in range {
- ui.horizontal(|ui| {
- if ui
- .selectable_label(
- cur_font_page == r,
- format!(
- "{r}. {}",
- icy_engine::parsers::ansi::constants::ANSI_FONT_NAMES[r]
- ),
- )
- .clicked()
- {
- result = Some(Message::SetFontPage(r));
- }
- });
- }
- },
- );
+ .show_rows(ui, row_height, ANSI_FONTS, |ui, range| {
+ for r in range {
+ ui.horizontal(|ui| {
+ if ui
+ .selectable_label(cur_font_page == r, format!("{r}. {}", FONT_NAMES[r]))
+ .clicked()
+ {
+ result = Some(Message::SetFontPage(r));
+ }
+ });
+ }
+ });
result
}