diff options
| -rw-r--r-- | ranger/colorschemes/default.py | 2 | ||||
| -rw-r--r-- | ranger/defaults/options.py | 3 | ||||
| -rw-r--r-- | ranger/gui/context.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/browsercolumn.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/browserview.py | 78 | ||||
| -rw-r--r-- | ranger/shared/settings.py | 1 |
6 files changed, 82 insertions, 6 deletions
diff --git a/ranger/colorschemes/default.py b/ranger/colorschemes/default.py index f5c5d763..d1a7e820 100644 --- a/ranger/colorschemes/default.py +++ b/ranger/colorschemes/default.py @@ -30,6 +30,8 @@ class Default(ColorScheme): attr = normal if context.empty or context.error: bg = red + if context.border: + fg = default if context.media: if context.image: fg = yellow diff --git a/ranger/defaults/options.py b/ranger/defaults/options.py index 74450ba5..a7090285 100644 --- a/ranger/defaults/options.py +++ b/ranger/defaults/options.py @@ -50,6 +50,9 @@ preview_directories = True max_filesize_for_preview = 300 * 1024 # 300kb collapse_preview = True +# Draw borders around columns? +draw_borders = False + # Set a title for the window? update_title = True diff --git a/ranger/gui/context.py b/ranger/gui/context.py index 25544932..d31124ca 100644 --- a/ranger/gui/context.py +++ b/ranger/gui/context.py @@ -25,7 +25,7 @@ CONTEXT_KEYS = ['reset', 'error', 'scroll', 'all', 'bot', 'top', 'percentage', 'marked', 'tagged', 'tag_marker', 'help_markup', - 'seperator', 'key', 'special', + 'seperator', 'key', 'special', 'border', 'title', 'text', 'highlight', 'bars', 'quotes', 'keybuffer'] diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py index ed6b26d1..0f85841d 100644 --- a/ranger/gui/widgets/browsercolumn.py +++ b/ranger/gui/widgets/browsercolumn.py @@ -109,7 +109,7 @@ class BrowserColumn(Pager): return False if self.target.is_directory: - if not self.settings.preview_directories: + if self.level > 0 and not self.settings.preview_directories: return False return True diff --git a/ranger/gui/widgets/browserview.py b/ranger/gui/widgets/browserview.py index 24bf85b0..6348517c 100644 --- a/ranger/gui/widgets/browserview.py +++ b/ranger/gui/widgets/browserview.py @@ -14,6 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """The BrowserView manages a set of BrowserColumns.""" +import curses from . import Widget from .browsercolumn import BrowserColumn from .pager import Pager @@ -30,6 +31,9 @@ class BrowserView(Widget, DisplayableContainer): DisplayableContainer.__init__(self, win) self.ratios = ratios self.preview = preview + self.old_cf = self.env.cf + self.old_prevfile = None + self.old_prevdir = None # normalize ratios: ratio_sum = float(sum(ratios)) @@ -64,11 +68,23 @@ class BrowserView(Widget, DisplayableContainer): if self.env.cmd.show_obj.draw_bookmarks: self._draw_bookmarks() except AttributeError: + if self.old_cf != self.env.cf: + self.need_clear = True + if self.settings.draw_borders: + if self.old_prevdir != self.settings.preview_directories: + self.need_clear = True + if self.old_prevfile != self.settings.preview_files: + self.need_clear = True if self.need_clear: self.win.erase() self.need_redraw = True self.need_clear = False + self.old_cf = self.env.cf + self.old_prevfile = self.settings.preview_files + self.old_prevdir = self.settings.preview_directories DisplayableContainer.draw(self) + if self.settings.draw_borders: + self._draw_borders() def finalize(self): if self.pager.visible: @@ -105,10 +121,62 @@ class BrowserView(Widget, DisplayableContainer): string = " " + key + ": " + mark.path self.addnstr(line, 0, string.ljust(maxlen), self.wid) + def _draw_borders(self): + win = self.win + self.color('in_browser', 'border') + + left_start = 0 + right_end = self.wid - 1 + + rows = [row for row in self.container \ + if isinstance(row, BrowserColumn)] + rows.sort(key=lambda row: row.x) + + for child in rows: + if not child.has_preview(): + left_start = child.x + child.wid + else: + break + for child in reversed(rows): + if not child.has_preview(): + right_end = child.x - 1 + else: + break + if right_end < left_start: + right_end = self.wid - 1 + + win.hline(0, left_start, curses.ACS_HLINE, right_end - left_start) + win.hline(self.hei - 1, left_start, curses.ACS_HLINE, + right_end - left_start) + win.vline(1, left_start, curses.ACS_VLINE, self.hei - 2) + + for child in rows: + if not child.has_preview(): + continue + x = child.x + child.wid + y = self.hei - 1 + try: + win.vline(1, x, curses.ACS_VLINE, y - 1) + win.addch(0, x, curses.ACS_TTEE, 0) + win.addch(y, x, curses.ACS_BTEE, 0) + except: + # in case it's off the boundaries + pass + + win.addch(0, left_start, curses.ACS_ULCORNER) + win.addch(self.hei - 1, left_start, curses.ACS_LLCORNER) + win.addch(0, right_end, curses.ACS_URCORNER) + try: + win.addch(self.hei - 1, right_end, curses.ACS_LRCORNER) + except: + pass + def resize(self, y, x, hei, wid): """Resize all the columns according to the given ratio""" DisplayableContainer.resize(self, y, x, hei, wid) - left = 0 + borders = self.settings.draw_borders + pad = 1 if borders else 0 + left = pad cut_off_last = self.preview and not self.preview_available \ and self.stretch_ratios @@ -124,13 +192,15 @@ class BrowserView(Widget, DisplayableContainer): wid = int(ratio * self.wid) if i == last_i: - wid = int(self.wid - left + 1) + wid = int(self.wid - left + 1 - pad) if i == last_i - 1: - self.pager.resize(0, left, hei, max(1, self.wid - left)) + self.pager.resize(pad, left, hei - pad * 2, \ + max(1, self.wid - left)) try: - self.container[i].resize(0, left, hei, max(1, wid-1)) + self.container[i].resize(pad, left, hei - pad * 2, \ + max(1, wid - 1)) except KeyError: pass diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py index 63d6d59a..cdddd623 100644 --- a/ranger/shared/settings.py +++ b/ranger/shared/settings.py @@ -25,6 +25,7 @@ ALLOWED_SETTINGS = { 'show_cursor': bool, 'autosave_bookmarks': bool, 'collapse_preview': bool, + 'draw_borders': bool, 'sort': str, 'reverse': bool, 'directories_first': bool, |