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

Add chainable EditView::filler methods

Browse Source 
And a few other filler fixes
This commit is contained in:
Alexandre Bury 2017-04-03 11:09:46 -07:00
parent b2bcf4138a
commit 5edc6fc163
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/edit_view.rs
View File

@ -124,11 +124,26 @@ impl EditView {
self.with(|s| s.set_secret(true)) self.with(|s| s.set_secret(true))
} }
/// Sets the character to fill in blank space /// Sets the character to fill in blank space.
/// ///
/// Defaults to "_" /// Defaults to "_".
pub fn set_filler(&mut self, filler: String) { pub fn set_filler<S: Into<String>>(&mut self, filler: S) {
self.filler = filler; self.filler = filler.into();
}
/// Sets the character to fill in blank space.
///
/// Chainable variant.
///
/// # Examples
///
/// ```rust
/// # use cursive::views::EditView;
/// let edit = EditView::new()
/// .filler(" ");
/// ```
pub fn filler<S: Into<String>>(self, filler: S) -> Self {
self.with(|s| s.set_filler(filler))
} }
/// Disables this view. /// Disables this view.
@ -389,6 +404,7 @@ impl EditView {
/// Only works for small `length` (1 or 2). /// Only works for small `length` (1 or 2).
/// Best used for single character replacement. /// Best used for single character replacement.
fn make_small_stars(length: usize) -> &'static str { fn make_small_stars(length: usize) -> &'static str {
// TODO: be able to use any character as hidden mode?
&"****"[..length] &"****"[..length]
} }
@ -414,8 +430,9 @@ impl View for EditView {
} else { } else {
printer.print((0, 0), &self.content); printer.print((0, 0), &self.content);
} }
let filler_len = (printer.size.x - width) / self.filler.width();
printer.print_hline((width, 0), printer.print_hline((width, 0),
printer.size.x - width, filler_len,
self.filler.as_str()); self.filler.as_str());
} else { } else {
let content = &self.content[self.offset..]; let content = &self.content[self.offset..];
@ -437,8 +454,9 @@ impl View for EditView {
} }
if width < self.last_length { if width < self.last_length {
let filler_len = (self.last_length - width) / self.filler.width();
printer.print_hline((width, 0), printer.print_hline((width, 0),
self.last_length - width, filler_len,
self.filler.as_str()); self.filler.as_str());
} }
} }
@ -447,7 +465,7 @@ impl View for EditView {
// Now print cursor // Now print cursor
if printer.focused { if printer.focused {
let c: &str = if self.cursor == self.content.len() { let c: &str = if self.cursor == self.content.len() {
"_" &self.filler
} else { } else {
// Get the char from the string... Is it so hard? // Get the char from the string... Is it so hard?
let selected = self.content[self.cursor..] let selected = self.content[self.cursor..]