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

Load themes from settings and rework Settings trait

Browse source
This commit is contained in:
Marshall Bowers 2023-10-25 20:37:55 +02:00
parent 98e2490807
commit e67048ee7b
19 changed files with 114 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/terminal2/src/terminal2.rs
View file

@ -33,6 +33,7 @@ use mappings::mouse::{
use procinfo::LocalProcessInfo;
use serde::{Deserialize, Serialize};
use settings2::Settings;
use terminal_settings::{AlternateScroll, Shell, TerminalBlink, TerminalSettings};
use util::truncate_and_trailoff;
@ -126,7 +127,7 @@ impl EventListener for ZedListener {
}
pub fn init(cx: &mut AppContext) {
settings2::register::<TerminalSettings>(cx);
TerminalSettings::register(cx);
}
#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
@ -1190,7 +1191,7 @@ impl Terminal {
origin: Point<Pixels>,
cx: &mut MainThread<ModelContext<Self>>,
) {
let setting = settings2::get::<TerminalSettings>(cx);
let setting = TerminalSettings::get_global(cx);
let position = e.position - origin;
if self.mouse_mode(e.modifiers.shift) {