arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix focus in ListView

Browse Source
This commit is contained in:
Alexandre Bury 2016-10-13 11:57:10 -07:00
parent 7c2d4a86f6
commit fde1091051
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/list_view.rs
View File

@ -50,13 +50,15 @@ impl ListView {
} }
/// Adds a view to the end of the list. /// Adds a view to the end of the list.
pub fn add_child<V: View + 'static>(&mut self, label: &str, view: V) { pub fn add_child<V: View + 'static>(&mut self, label: &str, mut view: V) {
view.take_focus(direction::Direction::none());
self.children.push(Child::Row(label.to_string(), Box::new(view))); self.children.push(Child::Row(label.to_string(), Box::new(view)));
} }
/// Removes all children from this view. /// Removes all children from this view.
pub fn clear(&mut self) { pub fn clear(&mut self) {
self.children.clear(); self.children.clear();
self.focus = 0;
} }
/// Adds a view to the end of the list. /// Adds a view to the end of the list.
@ -140,6 +142,10 @@ fn try_focus((i, child): (usize, &mut Child), source: direction::Direction)
impl View for ListView { impl View for ListView {
fn draw(&self, printer: &Printer) { fn draw(&self, printer: &Printer) {
if self.children.is_empty() {
return;
}
let offset = self.children let offset = self.children
.iter() .iter()
.map(Child::label) .map(Child::label)
@ -200,6 +206,10 @@ impl View for ListView {
} }
fn on_event(&mut self, event: Event) -> EventResult { fn on_event(&mut self, event: Event) -> EventResult {
if self.children.is_empty() {
return EventResult::Ignored;
}
if let Child::Row(_, ref mut view) = self.children[self.focus] { if let Child::Row(_, ref mut view) = self.children[self.focus] {
let result = view.on_event(event); let result = view.on_event(event);
if result.is_consumed() { if result.is_consumed() {