🔀 Merge pull request #95 from davep/discontent

Crop bookmarks and history the "improved" way

Author: davep

src/hike/widgets/navigation/bookmarks_view.py

@@ -9,10 +9,6 @@
 # httpx imports.
 from httpx import URL
 
-##############################################################################
-# Rich imports.
-from rich.text import Text
-
 ##############################################################################
 # Textual imports.
 from textual import on, work
@@ -46,23 +42,9 @@ def __init__(self, bookmark: Bookmark) -> None:
         self.bookmark = bookmark
         """The bookmark."""
         super().__init__(
-            # From Textual 2.x onwards overflow="ellipsis" is broken in the
-            # "improved" OptionList.
-            #
-            # https://github.com/Textualize/textual/issues/5701
-            #
-            # The result is ugly as fuck, and as best as I can tell I can't
-            # achieve the originally-intended layout; at least it isn't as
-            # obvious and accessible as simply using a `Text` was. So for
-            # now I'm going to wrap this in Textual's new `Content` -- which
-            # seems to be Rich-like only worse -- and accept it looks as
-            # ugly as fuck but less ugly than without this workaround.
-            Content.from_rich_text(
-                Text.from_markup(
-                    f"{REMOTE_FILE_ICON if isinstance(bookmark.location, URL) else LOCAL_FILE_ICON} "
-                    f"[bold]{bookmark.title}[/]\n[dim]{bookmark.location}[/]",
-                    overflow="ellipsis",
-                )
+            Content.from_markup(
+                f"{REMOTE_FILE_ICON if isinstance(bookmark.location, URL) else LOCAL_FILE_ICON} "
+                f"[bold]{bookmark.title}[/]\n[dim]{bookmark.location}[/]",
             ),
             id=str(bookmark.location),
         )
@@ -76,6 +58,8 @@ class BookmarksView(EnhancedOptionList):
     BookmarksView {
         height: 1fr;
         border: none;
+        text-wrap: nowrap;
+        text-overflow: ellipsis;
         &:focus {
             border: none;
         }

src/hike/widgets/navigation/history_view.py

@@ -5,10 +5,6 @@
 from pathlib import Path
 from typing import cast
 
-##############################################################################
-# Rich imports.
-from rich.text import Text
-
 ##############################################################################
 # Textual imports.
 from textual import on, work
@@ -42,25 +38,11 @@ def __init__(self, location_id: int, location: HikeLocation) -> None:
         self.location_id = location_id
         """The ID of the location within the history."""
         super().__init__(
-            # From Textual 2.x onwards overflow="ellipsis" is broken in the
-            # "improved" OptionList.
-            #
-            # https://github.com/Textualize/textual/issues/5701
-            #
-            # The result is ugly as fuck, and as best as I can tell I can't
-            # achieve the originally-intended layout; at least it isn't as
-            # obvious and accessible as simply using a `Text` was. So for
-            # now I'm going to wrap this in Textual's new `Content` -- which
-            # seems to be Rich-like only worse -- and accept it looks as
-            # ugly as fuck but less ugly than without this workaround.
-            Content.from_rich_text(
-                Text.from_markup(
-                    f"{LOCAL_FILE_ICON} [bold]{location.name}[/]\n[dim]{location.parent}[/]"
-                    if isinstance(location, Path)
-                    else f"{REMOTE_FILE_ICON} [bold]{Path(location.path).name}[/]"
-                    f"\n[dim]{Path(location.path).parent}\n{location.host}[/]",
-                    overflow="ellipsis",
-                )
+            Content.from_markup(
+                f"{LOCAL_FILE_ICON} [bold]{location.name}[/]\n[dim]{location.parent}[/]"
+                if isinstance(location, Path)
+                else f"{REMOTE_FILE_ICON} [bold]{Path(location.path).name}[/]"
+                f"\n[dim]{Path(location.path).parent}\n{location.host}[/]"
             ),
             id=str(location_id),
         )
@@ -74,6 +56,8 @@ class HistoryView(EnhancedOptionList):
     HistoryView {
         height: 1fr;
         border: none;
+        text-wrap: nowrap;
+        text-overflow: ellipsis;
         &:focus {
             border: none;
         }