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

Add Canvas::state_mut(&mut self)

Browse Source 
And missing Canvas::needs_relayout closure.
This commit is contained in:
Alexandre Bury 2017-01-24 10:48:00 -08:00
parent 146a532df0
commit afc681bcf4
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/views/canvas.rs
View File

@ -16,6 +16,7 @@ pub struct Canvas<T> {
required_size: Box<FnMut(Vec2, &mut T) -> Vec2>, required_size: Box<FnMut(Vec2, &mut T) -> Vec2>,
layout: Box<FnMut(Vec2, &mut T)>, layout: Box<FnMut(Vec2, &mut T)>,
take_focus: Box<FnMut(Direction, &mut T) -> bool>, take_focus: Box<FnMut(Direction, &mut T) -> bool>,
needs_relayout: Box<Fn(&T) -> bool>,
} }
impl<T> Canvas<T> { impl<T> Canvas<T> {
@ -38,17 +39,23 @@ impl<T> Canvas<T> {
required_size: Box::new(|_, _| Vec2::new(1, 1)), required_size: Box::new(|_, _| Vec2::new(1, 1)),
layout: Box::new(|_, _| ()), layout: Box::new(|_, _| ()),
take_focus: Box::new(|_, _| false), take_focus: Box::new(|_, _| false),
needs_relayout: Box::new(|_| true),
} }
} }
/// Sets the closure for `draw(&Printer)` /// Gets a mutable reference to the inner state.
pub fn state_mut(&mut self) -> &mut T {
&mut self.state
}
/// Sets the closure for `draw(&Printer)`.
pub fn set_draw<F>(&mut self, f: F) pub fn set_draw<F>(&mut self, f: F)
where F: 'static + Fn(&Printer, &T) where F: 'static + Fn(&Printer, &T)
{ {
self.draw = Box::new(f); self.draw = Box::new(f);
} }
/// Sets the closure for `draw(&Printer)` /// Sets the closure for `draw(&Printer)`.
/// ///
/// Chainable variant. /// Chainable variant.
pub fn with_draw<F>(self, f: F) -> Self pub fn with_draw<F>(self, f: F) -> Self
@ -57,14 +64,14 @@ impl<T> Canvas<T> {
self.with(|s| s.set_draw(f)) self.with(|s| s.set_draw(f))
} }
/// Sets the closure for `on_event(Event)` /// Sets the closure for `on_event(Event)`.
pub fn set_on_event<F>(&mut self, f: F) pub fn set_on_event<F>(&mut self, f: F)
where F: 'static + FnMut(Event, &mut T) -> EventResult where F: 'static + FnMut(Event, &mut T) -> EventResult
{ {
self.on_event = Box::new(f); self.on_event = Box::new(f);
} }
/// Sets the closure for `on_event(Event)` /// Sets the closure for `on_event(Event)`.
/// ///
/// Chainable variant. /// Chainable variant.
pub fn with_on_event<F>(self, f: F) -> Self pub fn with_on_event<F>(self, f: F) -> Self
@ -73,14 +80,14 @@ impl<T> Canvas<T> {
self.with(|s| s.set_on_event(f)) self.with(|s| s.set_on_event(f))
} }
/// Sets the closure for `required_size(Vec2)` /// Sets the closure for `required_size(Vec2)`.
pub fn set_required_size<F>(&mut self, f: F) pub fn set_required_size<F>(&mut self, f: F)
where F: 'static + FnMut(Vec2, &mut T) -> Vec2 where F: 'static + FnMut(Vec2, &mut T) -> Vec2
{ {
self.required_size = Box::new(f); self.required_size = Box::new(f);
} }
/// Sets the closure for `required_size(Vec2)` /// Sets the closure for `required_size(Vec2)`.
/// ///
/// Chainable variant. /// Chainable variant.
pub fn with_required_size<F>(self, f: F) -> Self pub fn with_required_size<F>(self, f: F) -> Self
@ -89,14 +96,14 @@ impl<T> Canvas<T> {
self.with(|s| s.set_required_size(f)) self.with(|s| s.set_required_size(f))
} }
/// Sets the closure for `layout(Vec2)` /// Sets the closure for `layout(Vec2)`.
pub fn set_layout<F>(&mut self, f: F) pub fn set_layout<F>(&mut self, f: F)
where F: 'static + FnMut(Vec2, &mut T) where F: 'static + FnMut(Vec2, &mut T)
{ {
self.layout = Box::new(f); self.layout = Box::new(f);
} }
/// Sets the closure for `layout(Vec2)` /// Sets the closure for `layout(Vec2)`.
/// ///
/// Chainable variant. /// Chainable variant.
pub fn with_layout<F>(self, f: F) -> Self pub fn with_layout<F>(self, f: F) -> Self
@ -105,14 +112,14 @@ impl<T> Canvas<T> {
self.with(|s| s.set_layout(f)) self.with(|s| s.set_layout(f))
} }
/// Sets the closure for `take_focus(Direction)` /// Sets the closure for `take_focus(Direction)`.
pub fn set_take_focus<F>(&mut self, f: F) pub fn set_take_focus<F>(&mut self, f: F)
where F: 'static + FnMut(Direction, &mut T) -> bool where F: 'static + FnMut(Direction, &mut T) -> bool
{ {
self.take_focus = Box::new(f); self.take_focus = Box::new(f);
} }
/// Sets the closure for `take_focus(Direction)` /// Sets the closure for `take_focus(Direction)`.
/// ///
/// Chainable variant. /// Chainable variant.
pub fn with_take_focus<F>(self, f: F) -> Self pub fn with_take_focus<F>(self, f: F) -> Self
@ -120,9 +127,26 @@ impl<T> Canvas<T> {
{ {
self.with(|s| s.set_take_focus(f)) self.with(|s| s.set_take_focus(f))
} }
/// Sets the closure for `needs_relayout()`.
pub fn set_needs_relayout<F>(&mut self, f: F)
where F: 'static + Fn(&T) -> bool
{
self.needs_relayout = Box::new(f);
}
/// Sets the closure for `needs_relayout()`.
///
/// Chainable variant.
pub fn with_needs_relayout<F>(self, f: F) -> Self
where F: 'static + Fn(&T) -> bool
{
self.with(|s| s.set_needs_relayout(f))
}
} }
impl <T> View for Canvas<T> { impl<T> View for Canvas<T> {
fn draw(&self, printer: &Printer) { fn draw(&self, printer: &Printer) {
(self.draw)(printer, &self.state); (self.draw)(printer, &self.state);
} }