syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

SdfTerm: calculate layer size & offset with configurable font size

Browse source
This commit is contained in:
Michael Sippel 2021-09-12 17:40:03 +02:00
parent cdeb0f9bc8
commit 029d2c4e02
Signed by: senvas
GPG key ID: F96CF119C34B64A6
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sdf_editor/src/main.rs
View file

@ -72,10 +72,13 @@ impl Observer<dyn SequenceView<Item = u32>> for ColorCollector {
} }
struct SdfTerm { struct SdfTerm {
pub src_view: Option<Arc<dyn TerminalView>>, src_view: Option<Arc<dyn TerminalView>>,
bg_layers: HashMap<Point2<i16>, (bool, LayerId2d)>, bg_layers: HashMap<Point2<i16>, (bool, LayerId2d)>,
fg_layers: HashMap<Point2<i16>, (bool, LayerId2d)>, fg_layers: HashMap<Point2<i16>, (bool, LayerId2d)>,
//font: Arc<RwLock<Font>>,
font_height: usize,
//font: Mutex<Font>,
renderer: Arc<Mutex<MarpBackend>> renderer: Arc<Mutex<MarpBackend>>
} }
@ -85,7 +88,8 @@ impl SdfTerm {
src_view: None, src_view: None,
bg_layers: HashMap::new(), bg_layers: HashMap::new(),
fg_layers: HashMap::new(), fg_layers: HashMap::new(),
//font: Arc::new(RwLock::new(Font::from_path(Path::new("/usr/share/fonts/TTF/FiraCode-Medium.ttf"),0).unwrap())), font_height: 60,
//font: Mutex::new(Font::from_path(Path::new("/usr/share/fonts/TTF/FiraCode-Medium.ttf"),0).unwrap()),
renderer renderer
} }
} }
@ -121,8 +125,8 @@ impl SdfTerm {
self.renderer.lock().unwrap().set_layer_info( self.renderer.lock().unwrap().set_layer_info(
id.into(), id.into(),
LayerInfo { LayerInfo {
extent: (60, 100), extent: (1 + self.font_height / 2, self.font_height),
location: (pt.x as usize * 60, pt.y as usize * 100) location: (pt.x as usize * self.font_height / 2, pt.y as usize * self.font_height)
}); });
self.bg_layers.insert(*pt, (false, id)); self.bg_layers.insert(*pt, (false, id));
@ -140,8 +144,8 @@ impl SdfTerm {
self.renderer.lock().unwrap().set_layer_info( self.renderer.lock().unwrap().set_layer_info(
id.into(), id.into(),
LayerInfo { LayerInfo {
extent: (60, 100), extent: (1 + self.font_height / 2, self.font_height),
location: (pt.x as usize * 60, pt.y as usize * 100) location: (pt.x as usize * self.font_height / 2, pt.y as usize * self.font_height)
}); });
self.fg_layers.insert(*pt, (false, id)); self.fg_layers.insert(*pt, (false, id));