diff options
| author | nfnty <git@nfnty.se> | 2015-10-21 22:40:01 +0200 |
|---|---|---|
| committer | nfnty <git@nfnty.se> | 2016-02-08 04:43:04 +0100 |
| commit | afa5d293a11f2955871493ad25b161beddad96a6 (patch) | |
| tree | c5e2d560c23ba0ce87232ef22f5384c82e573fa7 | |
| parent | 70bf1625c2bffa60d952059c3f9d55c13014a588 (diff) | |
| download | ranger-afa5d293a11f2955871493ad25b161beddad96a6.tar.gz | |
VCS: Minor fixes
| -rw-r--r-- | ranger/gui/widgets/browsercolumn.py | 13 | ||||
| -rw-r--r-- | ranger/gui/widgets/browserview.py | 3 | ||||
| -rw-r--r-- | ranger/gui/widgets/statusbar.py | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py index 8961f48f..13c8f510 100644 --- a/ranger/gui/widgets/browsercolumn.py +++ b/ranger/gui/widgets/browsercolumn.py @@ -256,11 +256,14 @@ class BrowserColumn(Pager): metakey = hash(repr(sorted(metadata.items()))) if metadata else 0 key = (self.wid, selected_i == i, drawn.marked, self.main_column, - drawn.path in copied, tagged_marker, drawn.infostring, - drawn.vcspathstatus, - drawn.vcs.remotestatus if drawn.is_directory and drawn.vcs and drawn.vcs.track and drawn.vcs.is_root else None, - self.fm.do_cut, - current_linemode.name, metakey) + drawn.path in copied, tagged_marker, drawn.infostring, + drawn.vcspathstatus, + drawn.vcs.remotestatus \ + if drawn.is_directory and drawn.vcs \ + and drawn.vcs.is_root and drawn.vcs.track \ + else None, + self.fm.do_cut, + current_linemode.name, metakey) if key in drawn.display_data: self.execute_curses_batch(line, drawn.display_data[key]) diff --git a/ranger/gui/widgets/browserview.py b/ranger/gui/widgets/browserview.py index 56b9eba7..e9640208 100644 --- a/ranger/gui/widgets/browserview.py +++ b/ranger/gui/widgets/browserview.py @@ -21,7 +21,6 @@ class BrowserView(Widget, DisplayableContainer): old_collapse = False draw_hints = False draw_info = False - vcsthread = None def __init__(self, win, ratios, preview = True): DisplayableContainer.__init__(self, win) @@ -92,8 +91,6 @@ class BrowserView(Widget, DisplayableContainer): self.need_redraw = True self.need_clear = False for tab in self.fm.tabs.values(): - if tab == self.fm.thistab: - continue directory = tab.thisdir if directory: directory.load_content_if_outdated() diff --git a/ranger/gui/widgets/statusbar.py b/ranger/gui/widgets/statusbar.py index 538757fd..9783a7ad 100644 --- a/ranger/gui/widgets/statusbar.py +++ b/ranger/gui/widgets/statusbar.py @@ -93,9 +93,6 @@ class StatusBar(Widget): self.old_ctime = ctime self.need_redraw = True - if self.fm.thisdir.vcs and self.fm.thisdir.vcs.track: - self.need_redraw = True - if self.need_redraw: self.need_redraw = False |