scroll widget under mouse

Author: willmcgugan

poetry.lock

@@ -10,7 +10,7 @@ python = "^3.7"
 rich = "^10.3.0"
 
 [tool.poetry.dev-dependencies]
-#rich = {git = "[email protected]:willmcgugan/rich", rev = "tui"}
+rich = {git = "[email protected]:willmcgugan/rich", rev = "pretty-classes"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -5,6 +5,7 @@
 import logging
 import signal
 from typing import Any, ClassVar, Type
+import warnings
 
 from rich.control import Control
 from rich.repr import rich_repr, RichReprResult
@@ -23,6 +24,14 @@
 log = logging.getLogger("rich")
 
 
+# asyncio will warn against resources not being cleared
+warnings.simplefilter("always", ResourceWarning)
+# https://github.com/boto/boto3/issues/454
+warnings.filterwarnings(
+    "ignore", category=ResourceWarning, message="unclosed.*<ssl.SSLSocket.*>"
+)
+
+
 LayoutDefinition = "dict[str, Any]"
 
 try:
@@ -76,28 +85,36 @@ def on_keyboard_interupt(self) -> None:
         asyncio.run_coroutine_threadsafe(self.post_message(event), loop=loop)
 
     async def process_messages(self) -> None:
+        try:
+            await self._process_messages()
+        except Exception:
+            self.console.print_exception(show_locals=True)
+
+    async def _process_messages(self) -> None:
         log.debug("driver=%r", self.driver)
         loop = asyncio.get_event_loop()
 
         loop.add_signal_handler(signal.SIGINT, self.on_keyboard_interupt)
         driver = self.driver(self.console, self)
-        try:
-            driver.start_application_mode()
-        except Exception:
-            log.exception("error starting application mode")
-            raise
 
         active_app.set(self)
 
         await self.add(self.view)
 
         await self.post_message(events.Startup(sender=self))
-        self.refresh()
         try:
+            driver.start_application_mode()
+        except Exception:
+            log.exception("error starting application mode")
+            raise
+        try:
+            self.refresh()
             await super().process_messages()
         finally:
-            loop.remove_signal_handler(signal.SIGINT)
-            driver.stop_application_mode()
+            try:
+                driver.stop_application_mode()
+            finally:
+                loop.remove_signal_handler(signal.SIGINT)
 
         await asyncio.gather(*(child.close_messages() for child in self.children))
         self.children.clear()
@@ -116,7 +133,6 @@ async def on_event(self, event: events.Event, priority: int) -> None:
         if isinstance(event, events.Key):
             key_action = self.KEYS.get(event.key, None)
             if key_action is not None:
-                log.debug("action %r", key_action)
                 await self.action(key_action)
                 return
 
@@ -149,18 +165,11 @@ async def dispatch_action(
         self, destination: str, action_name: str, params: Any
     ) -> None:
         action_target = self._action_targets.get(destination, None)
-        log.debug("ACTION TARGET %r", action_target)
         if action_target is not None:
             method_name = f"action_{action_name}"
             method = getattr(action_target, method_name, None)
-            log.debug("ACTION METHOD %r", method)
             if method is not None:
-                try:
-                    await method(*params)
-                except Exception:
-                    log.exception(
-                        f"error in action {destination}.{action_name}{params!r}"
-                    )
+                await method(*params)
 
     async def on_shutdown_request(self, event: events.ShutdownRequest) -> None:
         log.debug("shutdown request")
@@ -187,6 +196,9 @@ async def on_mouse_scroll_down(self, event: events.MouseScrollUp) -> None:
     async def action_quit(self) -> None:
         await self.close_messages()
 
+    async def action_bang(self) -> None:
+        1 / 0
+
 
 if __name__ == "__main__":
     import asyncio
@@ -212,7 +224,7 @@ async def action_quit(self) -> None:
 
     class MyApp(App):
 
-        KEYS = {"q": "quit", "ctrl+c": "quit", "b": "view.toggle('left')"}
+        KEYS = {"q": "quit", "x": "bang", "ctrl+c": "quit", "b": "view.toggle('left')"}
 
         async def on_startup(self, event: events.Startup) -> None:
             await self.view.mount_all(

src/textual/app.py

@@ -144,9 +144,9 @@ async def process_messages(self) -> None:
                 priority, message = await self.get_message()
             except MessagePumpClosed:
                 break
-            except Exception:
-                log.exception("error getting message")
-                break
+            except Exception as error:
+                raise error from None
+
             log.debug("%r -> %r", message, self)
             # Combine any pending messages that may supersede this one
             while True:
@@ -157,8 +157,9 @@ async def process_messages(self) -> None:
 
             try:
                 await self.dispatch_message(message, priority)
-            except Exception:
-                log.exception("error dispatching %r", message)
+            except Exception as error:
+                raise
+
             finally:
                 if self._message_queue.empty():
                     idle_handler = getattr(self, "on_idle", None)

src/textual/message_pump.py

@@ -75,7 +75,7 @@ def render_bar(
     start_index, start_bar = divmod(start, 8)
     end_index, end_bar = divmod(end, 8)
 
-    if start_index == end_index:
+    if window_size / step_size <= 1:
         if start_index < len(segments):
             segments[start_index] = _Segment(" ", _Style(bgcolor=bar))
     else:

src/textual/scrollbar.py

@@ -218,6 +218,11 @@ async def forward_input_event(self, event: events.Event) -> None:
                 pass
             else:
                 await widget.forward_input_event(event)
+        elif isinstance(event, (events.MouseScrollDown, events.MouseScrollUp)):
+            widget, _region = self.get_widget_at(event.x, event.y)
+            scroll_widget = widget or self.focused
+            if scroll_widget is not None:
+                await scroll_widget.forward_input_event(event)
         else:
             if self.focused is not None:
                 await self.focused.forward_input_event(event)