Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Textualize/textual into keymaps
Browse files Browse the repository at this point in the history
  • Loading branch information
darrenburns committed Sep 23, 2024
2 parents 7510332 + 322a85c commit cc1ef22
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 71 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## [0.80.0] - 2024-09-23

### Added

Expand Down Expand Up @@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Fixed flicker when setting `dark` reactive on startup https://github.com/Textualize/textual/pull/4989
- Fixed command palette not sorting search results by their match score https://github.com/Textualize/textual/pull/4994
- Fixed `DataTable` cached height issue on re-populating the table when using auto-height rows https://github.com/Textualize/textual/pull/4992
- Fixed inline app output being cleared when `inline_no_clear=True` https://github.com/Textualize/textual/issues/5019

## [0.79.1] - 2024-08-31

Expand Down Expand Up @@ -2380,6 +2381,7 @@ https://textual.textualize.io/blog/2022/11/08/version-040/#version-040
- New handler system for messages that doesn't require inheritance
- Improved traceback handling

[0.80.0]: https://github.com/Textualize/textual/compare/v0.79.0...v0.80.0
[0.79.0]: https://github.com/Textualize/textual/compare/v0.78.0...v0.79.0
[0.78.0]: https://github.com/Textualize/textual/compare/v0.77.0...v0.78.0
[0.77.0]: https://github.com/Textualize/textual/compare/v0.76.0...v0.77.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "textual"
version = "0.79.1"
version = "0.80.0"
homepage = "https://github.com/Textualize/textual"
repository = "https://github.com/Textualize/textual"
documentation = "https://textual.textualize.io/"
Expand Down
14 changes: 11 additions & 3 deletions src/textual/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2959,10 +2959,18 @@ async def invoke_ready_callback() -> None:
self._driver.write(
Control.move(-cursor_x, -cursor_y + 1).segment.text
)
if inline_no_clear and not not self.app._exit_renderables:
if inline_no_clear and not self.app._exit_renderables:
console = Console()
console.print(self.screen._compositor)
console.print()
try:
console.print(self.screen._compositor)
except ScreenStackError:
console.print()
else:
self._driver.write(
Control.move(
-cursor_x, -self.INLINE_PADDING - 1
).segment.text
)

driver.stop_application_mode()
except Exception as error:
Expand Down
4 changes: 2 additions & 2 deletions src/textual/drivers/linux_inline_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ def stop_application_mode(self) -> None:
"""Stop application mode, restore state."""
self._disable_bracketed_paste()
self.disable_input()

self.write("\x1b[2A\x1b[J")
self.write("\x1b[<u") # Disable kitty protocol
self.write("\x1b[J")

if self.attrs_before is not None:
try:
Expand Down
3 changes: 3 additions & 0 deletions src/textual/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,10 @@ def __init__(
"""The scroll position on the Y axis."""

scroll_target_x = Reactive(0.0, repaint=False)
"""Scroll target destination, X coord."""

scroll_target_y = Reactive(0.0, repaint=False)
"""Scroll target destination, Y coord."""

show_vertical_scrollbar: Reactive[bool] = Reactive(False, layout=True)
"""Show a vertical scrollbar?"""
Expand Down
Loading

0 comments on commit cc1ef22

Please sign in to comment.