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

BoxView Fixed, AtLeast, AtMost SizeConstraints (#368)

Browse Source 
* Add wrap_draw implementation for BoxView

This implementation was required because the restriction of fixed &
at least sized BoxView was not fulfilled with the default. The new
implementation takes this into consideration.
This commit is contained in:
Johannes Wünsche 2019-08-20 00:16:41 +02:00 committed by Alexandre Bury
parent 618e07ff34
commit e47dd87e0c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/box_view.rs
View File

@ -1,3 +1,4 @@
use crate::printer::Printer;
use crate::vec::Vec2; use crate::vec::Vec2;
use crate::view::{SizeConstraint, View, ViewWrapper}; use crate::view::{SizeConstraint, View, ViewWrapper};
use crate::With; use crate::With;
@ -212,12 +213,19 @@ impl<T: View> BoxView<T> {
impl<T: View> ViewWrapper for BoxView<T> { impl<T: View> ViewWrapper for BoxView<T> {
wrap_impl!(self.view: T); wrap_impl!(self.view: T);
fn wrap_draw(&self, printer: &Printer) {
self.view.draw(&printer.inner_size(
self.size.zip_map(printer.size, |c, s| c.result((s, s))),
));
}
fn wrap_required_size(&mut self, req: Vec2) -> Vec2 { fn wrap_required_size(&mut self, req: Vec2) -> Vec2 {
// This is what the child will see as request. // This is what the child will see as request.
let req = self.size.zip_map(req, SizeConstraint::available); let req = self.size.zip_map(req, SizeConstraint::available);
// This is the size the child would like to have. // This is the size the child would like to have.
let child_size = self.view.required_size(req); // Given the constraints of our box.
let child_size = self.size.zip_map(req, |c, s| c.result((s, s)));
// Some of this request will be granted, but maybe not all. // Some of this request will be granted, but maybe not all.
let result = self let result = self