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

Fixed cursor out of bounds error with window resize.

Browse Source
This commit is contained in:
Michael Lazar
2015-05-12 01:47:03 -07:00
parent ea88f44db7
commit b375fb71e7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtv/page.py
View File

@@ -533,26 +533,21 @@ class BasePage(object):
def _move_cursor(self, direction): def _move_cursor(self, direction):
self._remove_cursor() self._remove_cursor()
valid, redraw = self.nav.move(direction, len(self._subwindows)) valid, redraw = self.nav.move(direction, len(self._subwindows))
if not valid: if not valid:
curses.flash() curses.flash()
# Note: ACS_VLINE doesn't like changing the attribute, so always redraw. # Note: ACS_VLINE doesn't like changing the attribute, so always redraw.
# if redraw: self._draw_content()
self._draw_content() self._draw_content()
self._add_cursor() self._add_cursor()
def _move_page(self, direction): def _move_page(self, direction):
self._remove_cursor() self._remove_cursor()
valid, redraw = self.nav.move_page(direction, valid, redraw = self.nav.move_page(direction, len(self._subwindows)-1)
len(self._subwindows)-1)
if not valid: if not valid:
curses.flash() curses.flash()
# Note: ACS_VLINE doesn't like changing the attribute, so always redraw.
self._draw_content() self._draw_content()
# Don't allow the cursor to go over the subwindow number
if self.nav.cursor_index >= len(self._subwindows):
self.nav.cursor_index = len(self._subwindows)-1
self._add_cursor() self._add_cursor()
def _edit_cursor(self, attribute=None): def _edit_cursor(self, attribute=None):
@@ -561,6 +556,12 @@ class BasePage(object):
if self.nav.absolute_index < 0: if self.nav.absolute_index < 0:
return return
# Don't allow the cursor to go over the number of subwindows
# This could happen if the window is resized and the cursor index is
# pushed out of bounds
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: if attr is not None:
attribute |= attr attribute |= attr