Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed some old dbgs and comments

Browse source
This commit is contained in:
Mikayla Maki 2022-07-15 18:42:07 -07:00
parent 523e565b9b
commit 6675c96c8a
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
assets/settings/default.json
View file

@ -68,8 +68,7 @@
// Settings specific to the terminal // Settings specific to the terminal
"terminal": { "terminal": {
// What shell to use when opening a terminal. May take 3 values: // What shell to use when opening a terminal. May take 3 values:
// 1. Use the system's terminal configuration (e.g. $TERM). Note this is not // 1. Use the system's default terminal configuration (e.g. $TERM).
// A substitution, only an exact text match
// "shell": "system" // "shell": "system"
// 2. A program: // 2. A program:
// "shell": { // "shell": {
@ -107,10 +106,10 @@
"env": [ "env": [
//["KEY", "value1:value2"] //["KEY", "value1:value2"]
] ]
//Set the terminal's font size. If this option is not listed, //Set the terminal's font size. If this option is not included,
//the terminal will default to matching the buffer's font size. //the terminal will default to matching the buffer's font size.
//"font_size": "15" //"font_size": "15"
//Set the terminal's font family. If this option is not listed, //Set the terminal's font family. If this option is not included,
//the terminal will default to matching the buffer's font family. //the terminal will default to matching the buffer's font family.
//"font_family": "Zed Mono" //"font_family": "Zed Mono"
}, },

2
crates/terminal/src/terminal_element.rs
View file

@ -427,7 +427,7 @@ fn make_text_style(font_cache: &FontCache, settings: &Settings) -> TextStyle {
.terminal_overrides .terminal_overrides
.font_family .font_family
.as_ref() .as_ref()
.and_then(|family_name| dbg!(font_cache.load_family(&[family_name]).log_err())) .and_then(|family_name| font_cache.load_family(&[family_name]).log_err())
.or_else(|| { .or_else(|| {
settings settings
.terminal_defaults .terminal_defaults