loic/PyExplorer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: dynamic size column width and right-edge curses crash

Browse source
This commit is contained in:
lohhiiccc 2026-07-02 20:45:34 +02:00
parent b88ecce6f5
commit a00381a2c2
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/IO/UI.py
View file

@ -32,11 +32,14 @@ class UI:
stdscr.addstr(0, 0, str(navigator.history[-1])[:width - 1]) stdscr.addstr(0, 0, str(navigator.history[-1])[:width - 1])
items = navigator.items items = navigator.items
size_width = max((len(self._format_size(item.size)) for item in items),
default=0)
available = max(0, height - self.HEADER_ROWS) available = max(0, height - self.HEADER_ROWS)
top = self._update_scroll(navigator, available) top = self._update_scroll(navigator, available)
for offset, item in enumerate(items[top:top + available]): for offset, item in enumerate(items[top:top + available]):
index = top + offset index = top + offset
self._render_item(stdscr, item, index, offset + self.HEADER_ROWS, width) self._render_item(stdscr, item, index, offset + self.HEADER_ROWS,
width, size_width)
prompt = self.app.prompt prompt = self.app.prompt
if prompt: if prompt:
@ -115,13 +118,22 @@ class UI:
ARROW_LEN = len(ARROW) ARROW_LEN = len(ARROW)
def _render_item(self, stdscr: curses.window, item: AItem, index: int, def _render_item(self, stdscr: curses.window, item: AItem, index: int,
row: int, width: int) -> None: row: int, width: int, size_width: int) -> None:
name, size, perm = item.fields() name, size, perm = item.fields()
name_len = len(name)
col_width = int(width / 3)
attr = self._get_attr(item, index) attr = self._get_attr(item, index)
stdscr.addstr(row, 0, name.ljust(col_width), attr)
size_str = self._format_size(size).rjust(size_width)
stdscr.addstr(row, 0, size_str, attr)
name_col = size_width + 1
perm_str = stat.filemode(perm)
# -1 keeps the very last column free: writing to the bottom-right
# cell of the window makes curses raise addwstr() == ERR.
perm_col = max(name_col, width - len(perm_str) - 1)
name_width = max(0, perm_col - 1 - name_col)
name_len = len(name)
stdscr.addstr(row, name_col, name.ljust(name_width)[:name_width], attr)
if type(item) is Symlink: if type(item) is Symlink:
target_pair = self.app.config.theme.pair_for( target_pair = self.app.config.theme.pair_for(
@ -131,11 +143,11 @@ class UI:
if index == self.app.navigator.cursor.pos: if index == self.app.navigator.cursor.pos:
attr_arrow |= curses.A_REVERSE attr_arrow |= curses.A_REVERSE
attr_target |= curses.A_REVERSE attr_target |= curses.A_REVERSE
stdscr.addstr(row, name_len, self.ARROW, attr_arrow) stdscr.addstr(row, name_col + name_len, self.ARROW, attr_arrow)
stdscr.addstr(row, name_len + self.ARROW_LEN, str(item.point_to), attr_target) stdscr.addstr(row, name_col + name_len + self.ARROW_LEN,
str(item.point_to), attr_target)
stdscr.addstr(row, col_width, self._format_size(size).ljust(col_width * 2), attr) stdscr.addstr(row, perm_col, perm_str, attr)
stdscr.addstr(row, col_width * 2, stat.filemode(perm), attr)
@property @property
def app(self) -> App: def app(self) -> App: