display_message simplified

This commit is contained in:
ysakamoto
2015-03-06 14:35:53 -06:00
parent 455f742a27
commit 3808c65060
2 changed files with 8 additions and 16 deletions

View File

@@ -71,7 +71,7 @@ class SubredditPage(BasePage):
self.reddit, name, self.loader) self.reddit, name, self.loader)
except (SubredditNameError, HTTPError): except (SubredditNameError, HTTPError):
display_message(self.stdscr, 'Invalid Subreddit') display_message(self.stdscr, ['Invalid Subreddit'])
else: else:
self.nav.page_index, self.nav.cursor_index = 0, 0 self.nav.page_index, self.nav.cursor_index = 0, 0

View File

@@ -141,25 +141,17 @@ def display_message(stdscr, message):
n_rows, n_cols = stdscr.getmaxyx() n_rows, n_cols = stdscr.getmaxyx()
if type(message) == list: box_width = max(map(len, message))
message_len = max(map(len, message)) box_height = len(message)
s_row = (n_rows - len(message)) // 2 s_row = (n_rows - box_height) // 2
s_col = (n_cols - message_len - 1) // 2 s_col = (n_cols - box_width - 1) // 2
window = stdscr.derwin(len(message) + 2, message_len + 3, s_row, s_col) window = stdscr.derwin(box_height + 2, box_width + 3, s_row, s_col)
else:
message_len = len(message)
s_row = (n_rows - 2) // 2
s_col = (n_cols - message_len - 1) // 2
window = stdscr.derwin(10, 3, s_row, s_col)
window.erase() window.erase()
window.border() window.border()
if type(message) == list: for i in range(box_height):
for i in range(len(message)): window.addstr(i + 1, 1, message[i])
window.addstr(i + 1, 1, message[i])
else:
window.addstr(1, 1, message)
window.refresh() window.refresh()
stdscr.getch() stdscr.getch()