version bump -> 0.6.2

CHANGELOG.md

@@ -1,34 +1,38 @@
+<a name="v0.6.2"></a>
+### v0.6.2 - 2019-02-18
+- all colors can be configured in conf.toml
+
 <a name="v0.6.1"></a>
-## v0.6.1 - 2019-02-14
+### v0.6.1 - 2019-02-14
 - complete verbs handling in help screen
 - faster regex search
 - fix missing version in `broot -V`
 
 <a name="v0.6.0"></a>
-## v0.6.0 - 2019-02-12
-### Major changes
+### v0.6.0 - 2019-02-12
+##### Major changes
 - broot now installs the **br** shell function itself *(for bash and zsh, help welcome for other shells)*
 - new verb `:toggle_trim_root` allows to keep all root children
 - verbs can refer to `{directory}` which is the parent dir when a simple file is selected
 - user configured verbs can be launched from parent shell too (like is done for `cd {directory}`)
-### Minor changes
+##### Minor changes
 - allow page up and page down on help screen
 - fuzzy pattern: increase score of match starting after word separator
 - better handle errors on a few cases of non suitable root (like passing an invalid path)
 - clearer status error on `:cd`. Mentions `<alt><enter>` in help
 - add a scrollbar on help screen
 
 <a name="v0.5.2"></a>
-## v0.5.2 - 2019-02-04
+### v0.5.2 - 2019-02-04
 - More responsive on slow disks
 - fix a link to documentation in autogenerated conf
 
 <a name="v0.5.1"></a>
-## v0.5.1 - 2019-02-03
+### v0.5.1 - 2019-02-03
 - alt-enter now executes `:cd`
 
 <a name="v0.5.0"></a>
-## v0.5.0 - 2019-01-30
+### v0.5.0 - 2019-01-30
 - patterns can be regexes (add a slash before or after the pattern)
 - configuration parsing more robust
 - no need to put all verbs in config: builtins are accessible even without being in config
@@ -39,31 +43,31 @@
 - more precise display of file/dir sizes
 
 <a name="0.4.7"></a>
-## 0.4.7 - 2019-01-21
+### 0.4.7 - 2019-01-21
 - fix some cases of panic on broot quitting
 - new `--cmd` program argument allows passing a sequence of commands to be immediately executed (see [updated documentation](https://github.com/Canop/broot/blob/master/documentation.md#passing-commands-as-program-argument))
 - better handling of symlink (display type of target, show invalid links, allow verbs on target)
 - compiled with rustc 1.32 which brings about 4% improvements in perfs compared to 1.31
 
 <a name="v0.4.6"></a>
-## v0.4.6 - 2019-01-12
+### v0.4.6 - 2019-01-12
 - fix configured verbs not correctly handling paths with spaces
 - fix `:q` not instantly quitting broot when computing size
 - hit enter on tree root correctly quits broot
 
 <a name="v0.4.5"></a>
-## v0.4.5 - 2019-01-11
+### v0.4.5 - 2019-01-11
 - Faster search, mainly
 
 <a name="v0.4.3"></a>
-## v0.4.3 - 2019-01-08
+### v0.4.3 - 2019-01-08
 - Faster search and directory size computation.
 
 <a name="v0.4.2"></a>
-## v0.4.2 - 2019-01-07
+### v0.4.2 - 2019-01-07
 - more complete search if time allows
 - search pattern kept after verb execution
 
 <a name="v0.4.1"></a>
-## v0.4.1 - 2019-01-07
+### v0.4.1 - 2019-01-07
 - first public release

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "broot"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["dystroy <[email protected]>"]
 repository = "https://github.com/Canop/broot"
 description = "Fuzzy Search + tree + cd"

src/help_states.rs

@@ -8,7 +8,6 @@ use crate::commands::{Action, Command};
 use crate::conf::Conf;
 use crate::screen_text::{Text, TextTable};
 use crate::screens::{Screen, ScreenArea};
-use crate::skin::Skin;
 use crate::status::Status;
 use crate::task_sync::TaskLifetime;
 use crate::verbs::{PrefixSearchResult, Verb, VerbExecutor};
@@ -50,7 +49,7 @@ impl AppState for HelpState {
                 AppStateCmdResult::Keep
             }
             Action::ScrollPage(dp) => {
-                self.area.try_scroll(*dp * i32::from(self.area.bottom-self.area.top));
+                self.area.try_scroll(*dp * (self.area.height()-1));
                 AppStateCmdResult::Keep
             }
             _ => AppStateCmdResult::Keep,

src/screen_text.rs

@@ -102,19 +102,19 @@ impl<'a, R> TextCol<'a, R> {}
 /// A small utility to format some data in a tabular way on screen
 pub struct TextTable<'a, R> {
     cols: Vec<TextCol<'a, R>>,
-    bar: String, // according to skin
+    md_bar: String, // according to skin
 }
 
 impl<'a, R> TextTable<'a, R> {
     pub fn new(skin: &Skin) -> TextTable<'a, R> {
-        let bar = format!(
+        let md_bar = format!(
             " {}│{} ",
             skin.table_border.fg,
             skin.reset.fg,
         );
         TextTable {
             cols: Vec::new(),
-            bar,
+            md_bar,
         }
     }
     pub fn add_col(&mut self, title: &str, extract: &'a Fn(&'a R) -> &str) {
@@ -140,7 +140,7 @@ impl<'a, R> TextTable<'a, R> {
         self.compute_col_widths(&rows);
         let mut header = String::new();
         for col in &self.cols {
-            header.push_str(&self.bar);
+            header.push_str(&self.md_bar);
             // we're lazy here:
             // we add some bold, and add 4 for the width because we know the * won't
             // show up on screen.
@@ -150,7 +150,7 @@ impl<'a, R> TextTable<'a, R> {
         for row in rows {
             let mut line = String::new();
             for (i, col) in self.cols.iter().enumerate() {
-                line.push_str(&self.bar);
+                line.push_str(&self.md_bar);
                 let s = (col.extract)(row);
                 if i == self.cols.len() - 1 {
                     line.push_str(&text.md_to_tty(s));

src/skin.rs

@@ -1,10 +1,14 @@
-use std::io::{self, Write};
-
-use crate::screens::Screen;
-
+/// Defines the Skin structure with its defautl value.
+///
+/// A skin is a collection of skin entries and the
+/// store of all color changing TTY codes used by
+/// the application. It can be changed by configuration.
 use std::collections::HashMap;
 use termion::color::{self, *};
 
+/// a Skin entry is a couple of strings, one for the foreground
+/// and one for the background, each one made of TTY escape
+/// codes defining color changes.
 pub struct SkinEntry {
     pub fg: String,
     pub bg: String,
@@ -46,26 +50,26 @@ macro_rules! Skin {
 }
 
 Skin! {
-    status_normal: White, AnsiValue::grayscale(2)
-    status_error: Red, AnsiValue::grayscale(2)
-    tree: AnsiValue::grayscale(5), Reset
-    selected_line: Reset, AnsiValue::grayscale(2)
-    permissions: AnsiValue::grayscale(15), Reset
-    size_text: AnsiValue::grayscale(15), Reset
-    size_bar_full: Reset, Magenta
-    size_bar_void: Reset, AnsiValue::grayscale(2)
-    file: White, Reset
-    directory: LightBlue, Reset
     char_match: Green, Reset
-    link: LightMagenta, Reset
+    code: Reset, AnsiValue::grayscale(2)
+    directory: LightBlue, Reset
+    file: White, Reset
     file_error: Red, Reset
-    unlisted: AnsiValue::grayscale(13), Reset
-    input: White, Reset
-    flag_label: AnsiValue::grayscale(14), AnsiValue::grayscale(1)
+    flag_label: AnsiValue::grayscale(12), AnsiValue::grayscale(1)
     flag_value: AnsiValue::grayscale(16), AnsiValue::grayscale(1)
-    code: Reset, AnsiValue::grayscale(2)
-    table_border: AnsiValue::grayscale(8), Reset
+    input: White, Reset
+    link: LightMagenta, Reset
+    permissions: AnsiValue::grayscale(15), Reset
+    selected_line: Reset, AnsiValue::grayscale(3)
+    size_bar_full: Reset, Magenta
+    size_bar_void: Reset, AnsiValue::grayscale(2)
+    size_text: AnsiValue::grayscale(15), Reset
     spinner: AnsiValue::grayscale(10), AnsiValue::grayscale(2)
+    status_error: Red, AnsiValue::grayscale(2)
+    status_normal: White, AnsiValue::grayscale(2)
+    table_border: AnsiValue::grayscale(8), Reset
+    tree: AnsiValue::grayscale(5), Reset
+    unlisted: AnsiValue::grayscale(13), Reset
 }
 
 

src/status.rs

@@ -5,7 +5,6 @@ use std::io::{self, Write};
 use termion;
 
 use crate::screens::Screen;
-use crate::skin::Skin;
 
 pub trait Status {
     fn write_status_text(&mut self, text: &str) -> io::Result<()>;