Bundle and use Inconsolata v2.012

There's a newer version of the font available but ligatures seem
broken googlefonts/Inconsolata#58 and googlefonts/Inconsolata#52.

As part of this commit I also upgraded rust-embed to use the new
exclusion feature, which allows us to skip embedding OS files like
`.DS_Store`.
This commit is contained in:
Antonio Scandurra
2021-09-04 17:02:20 +02:00
parent 0e4f77750a
commit 00f6bdcb24
16 changed files with 65 additions and 26 deletions
+11 -3
View File
@@ -2,12 +2,14 @@
#![allow(non_snake_case)]
use fs::OpenOptions;
use gpui::AssetSource;
use log::LevelFilter;
use parking_lot::Mutex;
use simplelog::SimpleLogger;
use std::{fs, path::PathBuf, sync::Arc};
use zed::{
self, assets,
self,
assets::Assets,
channel::ChannelList,
chat_panel, editor, file_finder,
fs::RealFs,
@@ -20,9 +22,15 @@ use zed::{
fn main() {
init_logger();
let app = gpui::App::new(assets::Assets).unwrap();
let app = gpui::App::new(Assets).unwrap();
let embedded_fonts = Assets
.list("fonts")
.into_iter()
.map(|f| Arc::new(Assets.load(&f).unwrap().to_vec()))
.collect();
app.platform().fonts().add_fonts(embedded_fonts).unwrap();
let themes = settings::ThemeRegistry::new(assets::Assets, app.font_cache());
let themes = settings::ThemeRegistry::new(Assets, app.font_cache());
let (settings_tx, settings) = settings::channel(&app.font_cache(), &themes).unwrap();
let languages = Arc::new(language::LanguageRegistry::new());
languages.set_theme(&settings.borrow().theme.syntax);