Font update

This commit is contained in:
2026-08-01 00:15:28 +03:00
parent b883600abf
commit cf0c371a19
12 changed files with 72 additions and 65 deletions
+7 -7
View File
@@ -3,11 +3,11 @@ use crate::data_provider::card_stats::load_stats_of_set;
use crate::lang::{SetOrderMode, WordData};
use crate::repetition::RepetitionState;
use crate::Page::{History, PreviousPage, Repetition};
use crate::{AppState, NavigatedPage, Page, RootMessage, DEFAULT_SPACING};
use crate::{jl_text_input, AppState, NavigatedPage, Page, RootMessage, DEFAULT_SPACING, USER_FONT};
use iced::widget::button::danger;
pub use iced::widget::button::{Catalog, Style};
use iced::widget::container::bordered_box;
use iced::widget::{button, column, container, radio, row, scrollable, space, text, text_input, Column};
use iced::widget::{button, column, container, radio, row, scrollable, space, text, Column};
use iced::{Border, Center, Element, Fill, Left, Length, Shadow, Task, Theme};
use rhai::{Engine, Scope};
use std::sync::{Arc, Mutex};
@@ -166,14 +166,14 @@ impl RepetitionsState {
return column![
scrollable(
column![
text_input("Название набора", &set.name)
jl_text_input("Название набора", &set.name)
.on_input(RepetitionsMessage::SetName),
text_input("Передняя сторона", &set.forward)
jl_text_input("Передняя сторона", &set.forward)
.on_input(RepetitionsMessage::SetForward),
text_input("Задняя сторона", &set.backward)
jl_text_input("Задняя сторона", &set.backward)
.on_input(RepetitionsMessage::SetBackward),
text!("Фильтр"),
text_input("", &set.filter).on_input(RepetitionsMessage::SetFilter),
jl_text_input("", &set.filter).on_input(RepetitionsMessage::SetFilter),
button("Проверить фильтр").on_press(RepetitionsMessage::TryFilter),
self.count_view(&set),
radio("Обычный режим", SetOrderMode::Default, Some(set.open_mode), RepetitionsMessage::SetOpenMode),
@@ -215,7 +215,7 @@ impl RepetitionsState {
let mut column = Column::new();
for word in set.worst_words_list.clone().unwrap() {
column = column.push(text!("{} | {}", &word.key, &word.value));
column = column.push(text!("{} | {}", &word.key, &word.value).font(USER_FONT));
}
column.into()
}