alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix animations going negative via scrollbar

Browse Source
This commit is contained in:
Darren Burns
2022-09-07 13:20:14 +01:00
parent c2dd521fbe
commit 73d332c38d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/textual/scrollbar.py
View File

@@ -10,7 +10,7 @@ from rich.style import Style, StyleType
from . import events from . import events
from ._types import MessageTarget from ._types import MessageTarget
from .geometry import Offset from .geometry import Offset, clamp
from .message import Message from .message import Message
from .reactive import Reactive from .reactive import Reactive
from .renderables.blank import Blank from .renderables.blank import Blank
@@ -100,6 +100,8 @@ class ScrollBarRender:
back = back_color back = back_color
bar = bar_color bar = bar_color
len_bars = len(bars)
width_thickness = thickness if vertical else 1 width_thickness = thickness if vertical else 1
_Segment = Segment _Segment = Segment
@@ -110,11 +112,11 @@ class ScrollBarRender:
if window_size and size and virtual_size and size != virtual_size: if window_size and size and virtual_size and size != virtual_size:
step_size = virtual_size / size step_size = virtual_size / size
start = int(position / step_size * 8) start = int(position / step_size * len_bars)
end = start + max(8, int(ceil(window_size / step_size * 8))) end = start + max(len_bars, int(ceil(window_size / step_size * len_bars)))
start_index, start_bar = divmod(start, 8) start_index, start_bar = divmod(max(0, start), len_bars)
end_index, end_bar = divmod(end, 8) end_index, end_bar = divmod(max(0, end), len_bars)
upper = {"@click": "scroll_up"} upper = {"@click": "scroll_up"}
lower = {"@click": "scroll_down"} lower = {"@click": "scroll_down"}
@@ -129,8 +131,9 @@ class ScrollBarRender:
_Segment(blank, _Style(bgcolor=bar, meta=foreground_meta)) _Segment(blank, _Style(bgcolor=bar, meta=foreground_meta))
] * (end_index - start_index) ] * (end_index - start_index)
# Apply the smaller bar characters to head and tail of scrollbar for more "granularity"
if start_index < len(segments): if start_index < len(segments):
bar_character = bars[7 - start_bar] bar_character = bars[len_bars - 1 - start_bar]
if bar_character != " ": if bar_character != " ":
segments[start_index] = _Segment( segments[start_index] = _Segment(
bar_character * width_thickness, bar_character * width_thickness,
@@ -139,7 +142,7 @@ class ScrollBarRender:
else _Style(bgcolor=bar, color=back, meta=foreground_meta), else _Style(bgcolor=bar, color=back, meta=foreground_meta),
) )
if end_index < len(segments): if end_index < len(segments):
bar_character = bars[7 - end_bar] bar_character = bars[len_bars - 1 - end_bar]
if bar_character != " ": if bar_character != " ":
segments[end_index] = _Segment( segments[end_index] = _Segment(
bar_character * width_thickness, bar_character * width_thickness,