Removed the bitfont selector. - icy_draw - icy_draw is the successor to mystic draw. fork / mirror
(HTM) git clone https://git.drkhsh.at/icy_draw.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 09eb9ef1e5369167ba72a4d01f6fe6bd1ec2ec80
(DIR) parent bb53129fdb0ce7ee68b5efd01beee46b1ee37ca0
(HTM) Author: Mike Krüger <mkrueger@posteo.de>
Date: Sun, 10 Sep 2023 15:13:05 +0200
Removed the bitfont selector.
Diffstat:
M i18n/de/icy_draw.ftl | 1 +
M i18n/en/icy_draw.ftl | 1 -
M src/ui/main_window.rs | 9 +++------
D src/ui/tools/bitfont_selector.rs | 65 -------------------------------
M src/ui/tools/mod.rs | 3 ---
5 files changed, 4 insertions(+), 75 deletions(-)
---
(DIR) diff --git a/i18n/de/icy_draw.ftl b/i18n/de/icy_draw.ftl
@@ -199,6 +199,7 @@ layer_tool_menu_merge_layer=Ebene zusammenführen
layer_tool_menu_delete_layer=Ebene löschen
char_table_tool_title=Zeichentabelle
+bitfont_tool_title=Fonts
bitfont_tool_title=Bitfont
minimap_tool_title=Übersicht
(DIR) diff --git a/i18n/en/icy_draw.ftl b/i18n/en/icy_draw.ftl
@@ -198,7 +198,6 @@ layer_tool_menu_merge_layer=Merge layer
layer_tool_menu_delete_layer=Delete layer
char_table_tool_title=Char table
-bitfont_tool_title=Fonts
minimap_tool_title=Preview
no_document_selected=No document selected
(DIR) diff --git a/src/ui/main_window.rs b/src/ui/main_window.rs
@@ -8,7 +8,7 @@ use std::{
};
use crate::{
- add_child, model::Tool, AnsiEditor, BitFontEditor, BitFontSelector, CharFontEditor,
+ add_child, model::Tool, AnsiEditor, BitFontEditor, CharFontEditor,
CharTableToolWindow, Commands, Document, DocumentBehavior, DocumentOptions, DocumentTab,
LayerToolWindow, Message, MinimapToolWindow, ModalDialog, ToolBehavior, ToolTab, TopBar,
};
@@ -175,13 +175,10 @@ impl MainWindow {
let char_table = tool_tree
.tiles
.insert_pane(ToolTab::new(CharTableToolWindow::default()));
- let bitfont_selector = tool_tree
- .tiles
- .insert_pane(ToolTab::new(BitFontSelector::default()));
-
+
let tab = tool_tree
.tiles
- .insert_tab_tile(vec![minimap, char_table, bitfont_selector]);
+ .insert_tab_tile(vec![minimap, char_table]);
let v = tool_tree.tiles.insert_vertical_tile(vec![tab, layers]);
tool_tree.root = Some(v);
(DIR) diff --git a/src/ui/tools/bitfont_selector.rs b/src/ui/tools/bitfont_selector.rs
@@ -1,65 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use eframe::egui::{self, RichText};
-use i18n_embed_fl::fl;
-use icy_engine::{ANSI_FONTS, FONT_NAMES};
-
-use crate::{AnsiEditor, Document, Message, ToolWindow};
-
-#[derive(Default)]
-pub struct BitFontSelector {}
-
-impl ToolWindow for BitFontSelector {
- fn get_title(&self) -> String {
- fl!(crate::LANGUAGE_LOADER, "bitfont_tool_title")
- }
-
- fn show_ui(
- &mut self,
- ui: &mut egui::Ui,
- active_document: Option<Arc<Mutex<Box<dyn Document>>>>,
- ) -> Option<Message> {
- if let Some(doc) = active_document {
- if let Some(editor) = doc.lock().unwrap().get_ansi_editor() {
- return show_font_list(ui, editor);
- }
- }
- ui.vertical_centered(|ui| {
- ui.add_space(8.0);
- ui.label(RichText::new(fl!(crate::LANGUAGE_LOADER, "no_document_selected")).small());
- });
- None
- }
-}
-
-fn show_font_list(ui: &mut egui::Ui, editor: &AnsiEditor) -> Option<Message> {
- let mut result = None;
-
- /*
- for (id, font) in editor.buffer_view.lock().get_buffer().font_iter() {
-
- if id >= 100 {
- // TODO
- }
- }*/
- let row_height = 23.0;
-
- let cur_font_page = editor.buffer_view.lock().get_caret().get_font_page();
-
- egui::ScrollArea::vertical()
- .id_source("bitfont_scroll_area")
- .max_height(300.)
- .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
-}
(DIR) diff --git a/src/ui/tools/mod.rs b/src/ui/tools/mod.rs
@@ -4,8 +4,5 @@ pub use layer_view::*;
mod char_table;
pub use char_table::*;
-mod bitfont_selector;
-pub use bitfont_selector::*;
-
mod minimap_view;
pub use minimap_view::*;