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

layout cache

Browse Source
This commit is contained in:
Will McGugan
2023-02-17 09:35:39 +00:00
parent ba49907f10
commit 06fa8d7e8e
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/textual/widget.py
View File

@@ -38,11 +38,9 @@ from . import errors, events, messages
from ._animator import DEFAULT_EASING, Animatable, BoundAnimator, EasingFunction from ._animator import DEFAULT_EASING, Animatable, BoundAnimator, EasingFunction
from ._arrange import DockArrangeResult, arrange from ._arrange import DockArrangeResult, arrange
from ._asyncio import create_task from ._asyncio import create_task
from ._cache import FIFOCache
from ._context import active_app from ._context import active_app
from ._easing import DEFAULT_SCROLL_EASING from ._easing import DEFAULT_SCROLL_EASING
from ._layout import Layout from ._layout import Layout
from ._profile import timer
from ._segment_tools import align_lines from ._segment_tools import align_lines
from ._styles_cache import StylesCache from ._styles_cache import StylesCache
from .actions import SkipAction from .actions import SkipAction
@@ -261,9 +259,8 @@ class Widget(DOMNode):
self._content_width_cache: tuple[object, int] = (None, 0) self._content_width_cache: tuple[object, int] = (None, 0)
self._content_height_cache: tuple[object, int] = (None, 0) self._content_height_cache: tuple[object, int] = (None, 0)
self._arrangement_cache: FIFOCache[ self._arrangement_cache_key: tuple[Size, int] = (Size(), -1)
tuple[Size, int], DockArrangeResult self._cached_arrangement: DockArrangeResult | None = None
] = FIFOCache(4)
self._styles_cache = StylesCache() self._styles_cache = StylesCache()
self._rich_style_cache: dict[str, tuple[Style, Style]] = {} self._rich_style_cache: dict[str, tuple[Style, Style]] = {}
@@ -281,7 +278,7 @@ class Widget(DOMNode):
self._add_children(*children) self._add_children(*children)
virtual_size = Reactive(Size(0, 0), repaint=False, layout=True) virtual_size = Reactive(Size(0, 0), layout=True)
auto_width = Reactive(True) auto_width = Reactive(True)
auto_height = Reactive(True) auto_height = Reactive(True)
has_focus = Reactive(False) has_focus = Reactive(False)
@@ -476,18 +473,22 @@ class Widget(DOMNode):
assert self.is_container assert self.is_container
cache_key = (size, self._nodes._updates) cache_key = (size, self._nodes._updates)
cached_result = self._arrangement_cache.get(cache_key) if (
if cached_result is not None: self._arrangement_cache_key == cache_key
return cached_result and self._cached_arrangement is not None
):
return self._cached_arrangement
arrangement = arrange(self, self._nodes, size, size) self._arrangement_cache_key = cache_key
self._arrangement_cache[cache_key] = arrangement arrangement = self._cached_arrangement = arrange(
self, self._nodes, size, self.screen.size
)
return arrangement return arrangement
def _clear_arrangement_cache(self) -> None: def _clear_arrangement_cache(self) -> None:
"""Clear arrangement cache, forcing a new arrange operation.""" """Clear arrangement cache, forcing a new arrange operation."""
self._arrangement_cache.clear() self._cached_arrangement = None
def _get_virtual_dom(self) -> Iterable[Widget]: def _get_virtual_dom(self) -> Iterable[Widget]:
"""Get widgets not part of the DOM. """Get widgets not part of the DOM.
@@ -1741,7 +1742,7 @@ class Widget(DOMNode):
""" """
return self.scroll_to( return self.scroll_to(
y=self.scroll_y + self.container_size.height, y=self.scroll_target_y + self.container_size.height,
animate=animate, animate=animate,
speed=speed, speed=speed,
duration=duration, duration=duration,
@@ -2147,11 +2148,10 @@ class Widget(DOMNode):
or self.virtual_size != virtual_size or self.virtual_size != virtual_size
or self._container_size != container_size or self._container_size != container_size
): ):
old_virtual_size = self.virtual_size
self._size = size self._size = size
self._reactive_virtual_size = virtual_size self.virtual_size = virtual_size
self._container_size = container_size self._container_size = container_size
if self.is_scrollable and old_virtual_size != self.virtual_size: if self.is_scrollable:
self._scroll_update(virtual_size) self._scroll_update(virtual_size)
self.refresh() self.refresh()
@@ -2294,8 +2294,6 @@ class Widget(DOMNode):
if layout: if layout:
self._layout_required = True self._layout_required = True
print("LAYOUT")
for ancestor in self.ancestors: for ancestor in self.ancestors:
if not isinstance(ancestor, Widget): if not isinstance(ancestor, Widget):
break break