From 2c12a598aa1efaae89932b3af18c45a0c50b8445 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 25 Mar 2021 22:11:49 +0100 Subject: fix: do not use raw TAB_WIN in bookmarks wins (wth) --- poezio/tabs/bookmarkstab.py | 3 +-- poezio/windows/bookmark_forms.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'poezio') diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py index 986e0b9d..4b7f708b 100644 --- a/poezio/tabs/bookmarkstab.py +++ b/poezio/tabs/bookmarkstab.py @@ -36,8 +36,7 @@ class BookmarksTab(Tab): self.header_win = windows.ColumnHeaderWin( ['name', 'room@server/nickname', 'password', 'autojoin', 'storage']) - self.bookmarks_win = windows.BookmarksWin( - self.bookmarks, self.height - 4, self.width, 1, 0) + self.bookmarks_win = windows.BookmarksWin(self.bookmarks) self.help_win = windows.HelpText('Ctrl+Y: save, Ctrl+G: cancel, ' '↑↓: change lines, tab: change ' 'column, M-a: add bookmark, C-k' diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py index 10851b3b..b8a60763 100644 --- a/poezio/windows/bookmark_forms.py +++ b/poezio/windows/bookmark_forms.py @@ -155,8 +155,8 @@ class BookmarksWin(Win): __slots__ = ('scroll_pos', '_current_input', 'current_horizontal_input', '_bookmarks', 'lines') - def __init__(self, bookmarks: BookmarkList, height: int, width: int, y: int, x: int) -> None: - self._win = base_wins.TAB_WIN.derwin(height, width, y, x) + def __init__(self, bookmarks: BookmarkList) -> None: + Win.__init__(self) self.scroll_pos = 0 self._current_input = 0 self.current_horizontal_input = 0 @@ -214,9 +214,7 @@ class BookmarksWin(Win): return bm def resize(self, height: int, width: int, y: int, x: int) -> None: - self.height = height - self.width = width - self._win = base_wins.TAB_WIN.derwin(height, width, y, x) + super().resize(height, width, y, x) # Adjust the scroll position, if resizing made the window too small # for the cursor to be visible while self.current_input - self.scroll_pos > self.height - 1: -- cgit v1.2.3