From e2d2f011c6373894b3cdcfbdb98fbc783504561a Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 3 Aug 2019 20:26:07 -0400 Subject: Add method for writing option menus to viewport Add a method for writing single-choice menus to the viewport, within a box. Unused for now. --- src/display/viewport.rs | 74 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 16 deletions(-) (limited to 'src/display/viewport.rs') diff --git a/src/display/viewport.rs b/src/display/viewport.rs index 9d17bc87dcff..c44316cdaad5 100644 --- a/src/display/viewport.rs +++ b/src/display/viewport.rs @@ -3,6 +3,7 @@ use super::DrawWithNeighbors; use crate::display::draw_box::draw_box; use crate::display::utils::clone_times; use crate::entities::entity::Entity; +use crate::types::menu::MenuInfo; use crate::types::Neighbors; use crate::types::{pos, BoundingBox, Direction, Position, Positioned}; use std::fmt::{self, Debug}; @@ -192,6 +193,41 @@ impl Viewport { self.cursor_state = CursorState::Game; Ok(()) } + + pub fn write_menu(&mut self, menu: &MenuInfo) -> io::Result<()> { + let menu_dims = menu.dimensions(); + + // TODO: check if the menu is too big + + let menu_position = self.game.position + pos(1, 1); + + let menu_box = BoundingBox { + dimensions: menu_dims, + position: menu_position, + }; + + debug!("writing menu at: {:?}", menu_box); + + draw_box(self, menu_box, BoxStyle::Thin)?; + + write!( + self, + "{}{}", + (menu_position + pos(2, 2)).cursor_goto(), + menu.prompt + )?; + + for (idx, option) in menu.options.iter().enumerate() { + write!( + self, + "{}{}", + (menu_position + pos(2, 4 + idx as i16)).cursor_goto(), + option + )?; + } + + Ok(()) + } } impl Positioned for Viewport { @@ -218,7 +254,6 @@ impl Write for Viewport { mod tests { use super::*; use crate::types::Dimensions; - // use proptest::prelude::*; #[test] fn test_visible() { @@ -243,19 +278,26 @@ mod tests { .visible(&Position { x: 1, y: 1 })); } - // proptest! { - // #[test] - // fn nothing_is_visible_in_viewport_off_screen(pos: Position, outer: BoundingBox) { - // let invisible_viewport = Viewport { - // outer, - // inner: BoundingBox { - // position: Position {x: -(outer.dimensions.w as i16), y: -(outer.dimensions.h as i16)}, - // dimensions: outer.dimensions, - // }, - // out: () - // }; - - // assert!(!invisible_viewport.visible(&pos)); - // } - // } + #[test] + fn test_write_menu() { + let buf: Vec = Vec::new(); + + let mut viewport = Viewport::new( + BoundingBox::at_origin(Dimensions::default()), + BoundingBox::at_origin(Dimensions::default()), + buf, + ); + + let menu = MenuInfo::new( + "Test menu".to_string(), + vec!["option 1".to_string(), "option 2".to_string()], + ); + + viewport.write_menu(&menu).unwrap(); + + let res = std::str::from_utf8(&viewport.out).unwrap(); + assert!(res.contains("Test menu")); + assert!(res.contains("option 1")); + assert!(res.contains("option 2")); + } } -- cgit 1.4.1