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

fix some bugs and add help to demo

Browse source
This commit is contained in:
Michael Sippel 2021-08-28 17:01:31 +02:00
parent 11eb30bd5b
commit a3d966df11
Signed by: senvas
GPG key ID: F96CF119C34B64A6
4 changed files with 173 additions and 73 deletions

19
nested/src/grid/flatten.rs
View file

@ -115,11 +115,10 @@ where Item: 'static
}
}
);
/*
if let Some(chunk) = self.chunks.get_mut(&chunk_idx) {
chunk.view = view;
} else {
*/
self.chunks.insert(
chunk_idx,
Chunk {
@ -128,9 +127,7 @@ where Item: 'static
view
}
);
/*
}
*/
chunk_port.0.update();
self.update_all_offsets();
@ -162,20 +159,24 @@ where Item: 'static
let mut col_widths = vec![0 as i16; (top_range.end.x) as usize];
let mut row_heights = vec![0 as i16; (top_range.end.y) as usize];
for chunk_idx in GridWindowIterator::from(self.top.range()) {
if let Some(chunk) = self.chunks.get_mut(&chunk_idx) {
let lim = chunk.view.range().end;
col_widths[chunk_idx.x as usize] = std::cmp::max(col_widths[chunk_idx.x as usize], lim.x);
row_heights[chunk_idx.y as usize] = std::cmp::max(row_heights[chunk_idx.y as usize], lim.y);
}
}
for chunk_idx in GridWindowIterator::from(self.top.range()) {
if let Some(chunk) = self.chunks.get_mut(&chunk_idx) {
let old_offset = chunk.offset;
let old_limit = chunk.limit;
chunk.limit = chunk.view.range().end;
chunk.offset = Vector2::new(
(0 .. chunk_idx.x as usize).map(|x| col_widths[x]).sum(),
(0 .. chunk_idx.y as usize).map(|y| row_heights[y]).sum()
);
chunk.limit = chunk.view.range().end;
col_widths[chunk_idx.x as usize] = std::cmp::max(col_widths[chunk_idx.x as usize], chunk.limit.x);
row_heights[chunk_idx.y as usize] = std::cmp::max(row_heights[chunk_idx.y as usize], chunk.limit.y);
if old_offset != chunk.offset {
dirty_idx.extend(
GridWindowIterator::from(

84
nested/src/list/editor.rs
View file

@ -137,6 +137,17 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
fn goto_end(&mut self) -> TreeNavResult {
let mut cur = self.cursor.get();
let i = cur.idx.unwrap_or(0);
if self.data.len() == 0 && cur.idx.is_none() {
self.cursor.set(
ListCursor {
mode: ListCursorMode::Insert,
idx: Some(0)
}
);
return TreeNavResult::Continue;
}
if i < self.data.len() {
match cur.mode {
ListCursorMode::Insert => {
@ -150,6 +161,16 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
}
}
ListCursorMode::Select => {
if self.data.len() == 0 && cur.idx.is_none() {
self.cursor.set(
ListCursor {
mode: ListCursorMode::Insert,
idx: Some(0)
}
);
return TreeNavResult::Continue;
}
if i+1 < self.data.len() || cur.idx.is_none() {
cur.idx = Some(self.data.len()-1);
self.cursor.set(cur);
@ -170,24 +191,25 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
}
TreeNavResult::Exit => {
drop(cur_edit);
self.up();
if let Some(i) = cur.idx {
if i+1 < self.data.len() {
self.nexd();
self.set_leaf_mode(cur_mode);
for x in 1 .. depth {
self.dn();
self.goto_home();
}
if i+1 < self.data.len() {
self.set_mode(ListCursorMode::Select);
self.nexd();
for x in 1 .. depth {
self.dn();
self.goto_end();
return TreeNavResult::Continue;
self.goto_home();
}
self.set_leaf_mode(cur_mode);
self.dn();
self.goto_end();
return TreeNavResult::Continue;
}
TreeNavResult::Exit
}
}
@ -201,13 +223,23 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
fn goto_home(&mut self) -> TreeNavResult {
let cur = self.cursor.get();
if self.data.len() == 0 && cur.idx.is_none() {
self.cursor.set(
ListCursor {
mode: ListCursorMode::Insert,
idx: Some(0)
}
);
return TreeNavResult::Continue;
}
match cur.mode {
ListCursorMode::Insert |
ListCursorMode::Select => {
if cur.idx != Some(0) {
self.cursor.set(
ListCursor {
mode: cur.mode,
mode: if self.data.len() == 0 { ListCursorMode::Insert } else { cur.mode },
idx: Some(0)
}
);
@ -226,9 +258,10 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
match cur_edit.goto_home() {
TreeNavResult::Exit => {
drop(cur_edit);
self.up();
if let Some(i) = cur.idx {
self.up();
if i > 0 {
self.set_mode(ListCursorMode::Select);
self.pxev();
@ -331,6 +364,7 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
self.up();
if i > 0 {
self.set_mode(ListCursorMode::Select);
self.pxev();
for x in 1 .. depth {
@ -341,7 +375,6 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
self.set_leaf_mode(cur_mode);
self.dn();
self.goto_end();
TreeNavResult::Continue
} else {
TreeNavResult::Exit
@ -391,17 +424,21 @@ where ItemEditor: TerminalTreeEditor + ?Sized + Send + Sync + 'static,
TreeNavResult::Exit => {
drop(cur_edit);
drop(ce);
self.up();
self.up();
if i+1 < self.data.len() {
self.set_mode(ListCursorMode::Select);
self.nexd();
for x in 0 .. depth {
for x in 1 .. depth {
self.dn();
self.goto_home();
}
self.set_leaf_mode(cur_mode);
self.dn();
self.goto_home();
TreeNavResult::Continue
} else {
TreeNavResult::Exit
@ -565,7 +602,7 @@ where ItemEditor: TerminalEditor + ?Sized + Send + Sync + 'static,
.map_item(
|_pt, atom|
atom.add_style_back(TerminalStyle::fg_color((90,60,200)))
.add_style_back(TerminalStyle::bg_color((0,0,0)))
//.add_style_back(TerminalStyle::bg_color((0,0,0)))
.add_style_back(TerminalStyle::bold(true))
),
ListEditorViewSegment::Select(sub_view) =>
@ -574,11 +611,11 @@ where ItemEditor: TerminalEditor + ?Sized + Send + Sync + 'static,
atom.add_style_front(TerminalStyle::bg_color((90,60,200)))
),
ListEditorViewSegment::Modify(sub_view) => {
sub_view.map_item(
sub_view.clone()/*.map_item(
|_pt, atom|
atom.add_style_back(TerminalStyle::bg_color((0,0,0)))
.add_style_back(TerminalStyle::bold(true))
)
atom//.add_style_back(TerminalStyle::bg_color((0,0,0)))
//.add_style_back(TerminalStyle::bold(true))
)*/
},
ListEditorViewSegment::View(sub_view) =>
sub_view.clone()
@ -684,7 +721,7 @@ where ItemEditor: TerminalEditor + ?Sized + Send + Sync + 'static,
});
}
}
fn set_mode(&mut self, mode: ListCursorMode) {
let mut cur = self.cursor.get();
@ -699,6 +736,7 @@ where ItemEditor: TerminalEditor + ?Sized + Send + Sync + 'static,
}
cur.mode = mode;
self.cursor.set(cur);
}
}

32
nested/src/string_editor.rs
View file

@ -5,7 +5,7 @@ use {
core::{ViewPort, OuterViewPort},
singleton::{SingletonView, SingletonBuffer},
vec::VecBuffer,
terminal::{TerminalView, TerminalEvent, TerminalEditor, TerminalEditorResult},
terminal::{TerminalView, TerminalStyle, TerminalEvent, TerminalEditor, TerminalEditorResult},
tree_nav::{TreeNav, TreeNavResult}
}
};
@ -40,6 +40,10 @@ impl TerminalEditor for CharEditor {
} else {
"".to_string()
})
.map_item(
|_idx, atom|
atom.add_style_back(TerminalStyle::fg_color((120, 200, 10)))
)
}
fn handle_terminal_event(&mut self, event: &TerminalEvent) -> TerminalEditorResult {
@ -60,4 +64,30 @@ impl TerminalEditor for CharEditor {
}
}
/*
pub struct ArgListEditor {
}
impl TreeNav for ArgListEditor {
}
impl TerminalEditor for ArgListEditor {
fn get_term_view(&self) -> OuterViewPort<dyn TerminalView> {
}
fn handle_terminal_event(&mut self, event: &TerminalEvent) -> TerminalEditorResult {
match event {
TerminalEvent::Input(Event::Key(Key::Char(' '))) => {
// list.get_arg()
// split
}
_ => {
}
}
}
}
*/