me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

android changes taken from ibaryshnikov

Browse source
This commit is contained in:
Your Name 2025-05-14 23:27:12 +02:00
parent 50cc94d944
commit a6f4b5ac0a
7 changed files with 130 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
graphics/src/text.rs
View file

@ -159,16 +159,31 @@ pub fn font_system() -> &'static RwLock<FontSystem> {
static FONT_SYSTEM: OnceLock<RwLock<FontSystem>> = OnceLock::new();
FONT_SYSTEM.get_or_init(|| {
#[allow(unused_mut)]
let mut raw = cosmic_text::FontSystem::new_with_fonts([
cosmic_text::fontdb::Source::Binary(Arc::new(
include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
)),
#[cfg(all(target_arch = "wasm32", feature = "fira-sans"))]
cosmic_text::fontdb::Source::Binary(Arc::new(
include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice(),
)),
]);
// Load system fonts for Android
// https://github.com/pop-os/cosmic-text/issues/243#issue-2189977938
#[cfg(target_os = "android")]
{
raw.db_mut().load_fonts_dir("/system/fonts");
raw.db_mut().set_sans_serif_family("Roboto");
raw.db_mut().set_serif_family("Noto Serif");
raw.db_mut().set_monospace_family("Droid Sans Mono"); // Cutive Mono looks more printer-like
raw.db_mut().set_cursive_family("Dancing Script");
raw.db_mut().set_fantasy_family("Dancing Script");
}
RwLock::new(FontSystem {
raw: cosmic_text::FontSystem::new_with_fonts([
cosmic_text::fontdb::Source::Binary(Arc::new(
include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
)),
#[cfg(feature = "fira-sans")]
cosmic_text::fontdb::Source::Binary(Arc::new(
include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice(),
)),
]),
raw,
loaded_fonts: HashSet::new(),
version: Version::default(),
})

2
graphics/src/text/editor.rs
View file

@ -438,6 +438,8 @@ impl editor::Editor for Editor {
cosmic_text::Action::Scroll { lines },
);
}
// Do nothing, these are for user convenience only
Action::Focus | Action::Blur => {}
}
self.0 = Some(Arc::new(internal));