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

fix locks in StringInsertView

Browse source
This commit is contained in:
Michael Sippel 2021-01-22 15:11:08 +01:00
parent b896dd897a
commit ef4bdf5b1a
Signed by: senvas
GPG key ID: F96CF119C34B64A6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/string_editor.rs
View file

@ -115,7 +115,7 @@ pub mod insert_view {
_data_obs: Arc<RwLock<ProjectionArg<dyn SequenceView<Item = char>, Self>>>, _data_obs: Arc<RwLock<ProjectionArg<dyn SequenceView<Item = char>, Self>>>,
cursor: Arc<dyn SingletonView<Item = usize>>, cursor: Arc<dyn SingletonView<Item = usize>>,
data: Arc<dyn SequenceView<Item = char>>, data: Arc<RwLock<dyn SequenceView<Item = char>>>,
cur_pos: usize, cur_pos: usize,
cast: Arc<RwLock<ObserverBroadcast<dyn TerminalView>>> cast: Arc<RwLock<ObserverBroadcast<dyn TerminalView>>>
} }
@ -130,16 +130,17 @@ pub mod insert_view {
fn get(&self, pos: &Point2<i16>) -> Option<TerminalAtom> { fn get(&self, pos: &Point2<i16>) -> Option<TerminalAtom> {
if pos.y == 0 && pos.x >= 0 { if pos.y == 0 && pos.x >= 0 {
let i = pos.x as usize; let i = pos.x as usize;
let len = self.data.len().unwrap_or(0); let data = self.data.read().unwrap();
let len = data.len().unwrap_or(0);
if i < len+1 { if i < len+1 {
return Some( return Some(
if i < self.cur_pos && i < len { if i < self.cur_pos {
TerminalAtom::from(self.data.get(&i).unwrap()) TerminalAtom::from(data.get(&i)?)
} else if i == self.cur_pos { } else if i == self.cur_pos {
TerminalAtom::new('|', TerminalStyle::fg_color((200, 0, 0))) TerminalAtom::new('|', TerminalStyle::fg_color((200, 0, 0)))
} else { } else {
TerminalAtom::from(self.data.get(&(i-1)).unwrap()) TerminalAtom::from(data.get(&(i - 1))?)
} }
); );
} }