gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added top height, still needs to be refactored + tested.

Browse Source
This commit is contained in:
Michael Lazar
2016-04-14 00:52:12 -07:00
parent 29d714997b
commit 26d1f0efcb
3 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtv/objects.py
View File

@@ -315,7 +315,8 @@ class Navigator(object):
valid_page_cb,
page_index=0,
cursor_index=0,
inverted=False):
inverted=False,
top_height=None):
"""
Params:
valid_page_callback (func): This function, usually `Content.get`,
@@ -336,6 +337,7 @@ class Navigator(object):
self.page_index = page_index
self.cursor_index = cursor_index
self.inverted = inverted
self.top_height = top_height
self._page_cb = valid_page_cb
@property
@@ -396,6 +398,7 @@ class Navigator(object):
# Flip the orientation and reset the cursor
self.flip(self.cursor_index)
self.cursor_index = 0
self.top_height = None
redraw = True
else:
if self.cursor_index > 0:
@@ -405,6 +408,7 @@ class Navigator(object):
if self._is_valid(self.absolute_index):
# We have reached the beginning of the page - move the
# index
self.top_height = None
redraw = True
else:
self.page_index += self.step
@@ -476,7 +480,7 @@ class Navigator(object):
assert n_windows >= 0
self.page_index += (self.step * n_windows)
self.cursor_index = n_windows
self.cursor_index = n_windows - self.cursor_index
self.inverted = not self.inverted
def _is_valid(self, page_index):

45
rtv/page.py
View File

@@ -314,6 +314,23 @@ class Page(object):
Loop through submissions and fill up the content page.
"""
# Case 1. Inverted, hiding the bottom element
# Case 2. Inverted, hiding or expanding middle elements
# Case 1+2. Inverted, hiding or expanding elements
# In both cases the screen jumps and is re-aligned with the selected
# item at the bottom of the screen. What we need to do is
# 1.) Grab the height of the top row (subwin.getmaxyx())
# 2.) Draw the page as non inverted, except for the top element. This
# element will be drawn as inverted with the smaller height
# 3.) If expanding and the bottom element also doesn't fit, redraw
# everything inverted as normal.
# 4.) Otherwise, this should ensure that the bottom element is always
# full visible and the cursor doesn't jump lines.
# Note: Should also disable drawing inverted if only one element
# Note: If only one comment, add (Not enough space to display)
n_rows, n_cols = self.term.stdscr.getmaxyx()
window = self.term.stdscr.derwin(
n_rows - self._row, n_cols, self._row, 0)
@@ -327,29 +344,41 @@ class Page(object):
# If not inverted, align the first submission with the top and draw
# downwards. If inverted, align the first submission with the bottom
# and draw upwards.
cancel_inverted = True
current_row = (win_n_rows - 1) if inverted else 0
available_rows = (win_n_rows - 1) if inverted else win_n_rows
top_height = self.nav.top_height if not inverted else None
for data in self.content.iterate(page_index, step, win_n_cols - 2):
subwin_n_rows = min(available_rows, data['n_rows'])
if top_height:
subwin_n_rows = min(subwin_n_rows, top_height)
subwin_n_cols = win_n_cols - data['offset']
start = current_row - subwin_n_rows if inverted else current_row
subwindow = window.derwin(
subwin_n_rows, subwin_n_cols, start, data['offset'])
attr = self._draw_item(subwindow, data, inverted)
self._subwindows.append((subwindow, attr))
attr = self._draw_item(subwindow, data, top_height or inverted)
self._subwindows.append((subwindow, attr, subwin_n_rows))
available_rows -= (subwin_n_rows + 1) # Add one for the blank line
current_row += step * (subwin_n_rows + 1)
top_height = None
if available_rows <= 0:
# Indicate the page is full and we can keep the inverted screen.
cancel_inverted = False
break
else:
# If the page is not full we need to make sure that it is NOT
if len(self._subwindows) == 1:
# Never draw inverted if only one subwindow. The top of the
# subwindow should always be aligned with the top of the screen.
cancel_inverted = True
if cancel_inverted and self.nav.inverted:
# In some special cases we need to make sure that the screen is NOT
# inverted. Unfortunately, this currently means drawing the whole
# page over again. Could not think of a better way to pre-determine
# if the content will fill up the page, given that it is dependent
# on the size of the terminal.
if self.nav.inverted:
self.nav.flip((len(self._subwindows) - 1))
self._draw_content()
self.nav.flip((len(self._subwindows) - 1))
self._draw_content()
self._row = n_rows
@@ -387,7 +416,7 @@ class Page(object):
if self.nav.cursor_index >= len(self._subwindows):
self.nav.cursor_index = len(self._subwindows) - 1
window, attr = self._subwindows[self.nav.cursor_index]
window, attr, _ = self._subwindows[self.nav.cursor_index]
if attr is not None:
attribute |= attr

6
rtv/submission.py
View File

@@ -34,10 +34,8 @@ class SubmissionPage(Page):
current_index = self.nav.absolute_index
self.content.toggle(current_index)
if self.nav.inverted:
# Reset the navigator so that the cursor is at the bottom of the
# page. This is a workaround to handle if folding the comment
# causes the cursor index to go out of bounds.
self.nav.page_index, self.nav.cursor_index = current_index, 0
self.nav.top_height = self._subwindows[-1][2]
self.nav.flip(len(self._subwindows) - 1)
@SubmissionController.register(Command('SUBMISSION_EXIT'))
def exit_submission(self):