diff --git a/rtv/content.py b/rtv/content.py index 41f192d..832ac4c 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -269,9 +269,9 @@ class SubmissionContent(BaseContent): elif data['type'] == 'MoreComments': with self._loader(): comments = data['object'].comments() - comments = self.flatten_comments(comments, root_level=data['level']) - comment_data = [self.strip_praw_comment(c) for c in comments] - self._comment_data[index:index+1] = comment_data + comments = self.flatten_comments(comments, root_level=data['level']) + comment_data = [self.strip_praw_comment(c) for c in comments] + self._comment_data[index:index+1] = comment_data else: raise ValueError('% type not recognized' % data['type']) diff --git a/rtv/page.py b/rtv/page.py index e6746a1..53d3394 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -148,7 +148,7 @@ class BasePage(object): n_rows, n_cols = self._header_window.getmaxyx() self._header_window.erase() - attr = curses.A_REVERSE | curses.A_BOLD | Color.RED + attr = curses.A_REVERSE | curses.A_BOLD | Color.CYAN self._header_window.addnstr(0, 0, self.content.name, n_cols-1, attr) self._header_window.refresh() diff --git a/rtv/submission.py b/rtv/submission.py index 6c5d154..410a7e1 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -66,7 +66,8 @@ class SubmissionPage(BasePage): def refresh_content(self): self.content.reset() - self.stdscr.clear() + self.nav.page_index, self.nav.cursor_index = -1, 0 + self.nav.inverted = False self.draw() def draw_item(self, win, data, inverted=False): diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 234babb..bb0cc22 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -35,7 +35,6 @@ class SubredditPage(BasePage): # View submission elif cmd in (curses.KEY_RIGHT, curses.KEY_ENTER, ord(' '), 10): self.open_submission() - self.draw() # Enter edit mode to change subreddit elif cmd == ord('/'): @@ -44,6 +43,7 @@ class SubredditPage(BasePage): # Refresh page elif cmd in (curses.KEY_F5, ord('r')): self.refresh_content() + self.draw() elif cmd == curses.KEY_RESIZE: self.draw() @@ -71,16 +71,17 @@ class SubredditPage(BasePage): self.nav.inverted = False self.name = name - #self.stdscr.clear() self.draw() def prompt_subreddit(self): + attr = curses.A_BOLD | Color.MAGENTA prompt = 'Enter Subreddit: /r/' n_rows, n_cols = self.stdscr.getmaxyx() - self.stdscr.addstr(n_rows-1, 0, prompt) + self.stdscr.addstr(n_rows-1, 0, prompt, attr) self.stdscr.refresh() window = self.stdscr.derwin(n_rows-1, len(prompt)) + window.attrset(attr) out = text_input(window) if out is None: