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

Modified ProgressBar to allow for customization of bar's color. (#279)

Browse Source 
Added `color` component to `ProgressBar`.
Modified `ProgressBar::new` to default to `highlight` color.
Modified existing methods to use `color` component when printing.
Added relevant methods to change `color` component.
This commit is contained in:
Henry 2018-08-08 18:23:15 +01:00 committed by Alexandre Bury
parent 56d7646086
commit 528e986fc3
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/progress_bar.rs
View File

@ -1,7 +1,7 @@
use align::HAlign; use align::HAlign;
use std::cmp; use std::cmp;
use std::thread; use std::thread;
use theme::{ColorStyle, Effect}; use theme::{ColorStyle, ColorType, Effect};
use utils::Counter; use utils::Counter;
use view::View; use view::View;
use Printer; use Printer;
@ -17,6 +17,9 @@ use Printer;
/// It also prints a customizable text in the center of the bar, which /// It also prints a customizable text in the center of the bar, which
/// defaults to the progression percentage. /// defaults to the progression percentage.
/// ///
/// The bar defaults to the current theme's highlight color,
/// but that can be customized.
///
/// # Example /// # Example
/// ///
/// ``` /// ```
@ -35,6 +38,7 @@ pub struct ProgressBar {
min: usize, min: usize,
max: usize, max: usize,
value: Counter, value: Counter,
color: ColorType,
// TODO: use a Promise instead? // TODO: use a Promise instead?
label_maker: Box<Fn(usize, (usize, usize)) -> String>, label_maker: Box<Fn(usize, (usize, usize)) -> String>,
} }
@ -85,6 +89,7 @@ impl ProgressBar {
min: 0, min: 0,
max: 100, max: 100,
value: Counter::new(0), value: Counter::new(0),
color: ColorStyle::highlight().back,
label_maker: Box::new(make_percentage), label_maker: Box::new(make_percentage),
} }
} }
@ -183,6 +188,26 @@ impl ProgressBar {
pub fn set_value(&mut self, value: usize) { pub fn set_value(&mut self, value: usize) {
self.value.set(value); self.value.set(value);
} }
/// Sets the color style.
pub fn set_color<C>(&mut self, color: C)
where
C: Into<ColorType>,
{
self.color = color.into();
}
/// Sets the color style.
///
/// Chainable variant of `set_color`.
pub fn with_color<C>(mut self, color: C) -> Self
where
C: Into<ColorType>,
{
self.color = color.into();
self
}
} }
fn sub_block(extra: usize) -> &'static str { fn sub_block(extra: usize) -> &'static str {
@ -218,7 +243,10 @@ impl View for ProgressBar {
let label = (self.label_maker)(value, (self.min, self.max)); let label = (self.label_maker)(value, (self.min, self.max));
let offset = HAlign::Center.get_offset(label.len(), printer.size.x); let offset = HAlign::Center.get_offset(label.len(), printer.size.x);
printer.with_color(ColorStyle::highlight(), |printer| { let color_style =
ColorStyle::new(ColorStyle::highlight().front, self.color);
printer.with_color(color_style, |printer| {
// Draw the right half of the label in reverse // Draw the right half of the label in reverse
printer.with_effect(Effect::Reverse, |printer| { printer.with_effect(Effect::Reverse, |printer| {
printer.print((length, 0), sub_block(extra)); printer.print((length, 0), sub_block(extra));
@ -227,7 +255,7 @@ impl View for ProgressBar {
let printer = &printer.cropped((length, 1)); let printer = &printer.cropped((length, 1));
printer.print_hline((0, 0), length, " "); printer.print_hline((0, 0), length, " ");
// Draw the left part in highlight (it may be cropped) // Draw the left part in color_style (it may be cropped)
printer.print((offset, 0), &label); printer.print((offset, 0), &label);
}); });
} }