From 984ac596afc6f7d4a1fe695b7c902cd1a71414ec Mon Sep 17 00:00:00 2001
From: AnErrupTion <anerruption@disroot.org>
Date: Thu, 26 Mar 2026 21:55:35 +0100
Subject: [PATCH] Group for loops in event loop

Signed-off-by: AnErrupTion <anerruption@disroot.org>
---
 ly-ui/src/TerminalBuffer.zig | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/ly-ui/src/TerminalBuffer.zig b/ly-ui/src/TerminalBuffer.zig
index 034916c..4551d68 100644
--- a/ly-ui/src/TerminalBuffer.zig
+++ b/ly-ui/src/TerminalBuffer.zig
@@ -208,12 +208,10 @@ pub fn runEventLoop(
     var inactivity_time_start = try interop.getTimeOfDay();
 
     while (self.run) {
+        var maybe_timeout: ?usize = null;
+
         if (self.update) {
-            for (layers) |layer| {
-                for (layer) |widget| {
-                    try widget.update(context);
-                }
-            }
+            try TerminalBuffer.clearScreen(false);
 
             // Reset cursor
             const current_widget = self.getActiveWidget();
@@ -226,26 +224,20 @@ pub fn runEventLoop(
                 );
             };
 
-            try TerminalBuffer.clearScreen(false);
-
             for (layers) |layer| {
                 for (layer) |widget| {
+                    try widget.update(context);
                     widget.draw();
+
+                    if (try widget.calculateTimeout(context)) |widget_timeout| {
+                        if (maybe_timeout == null or widget_timeout < maybe_timeout.?) maybe_timeout = widget_timeout;
+                    }
                 }
             }
 
             TerminalBuffer.presentBuffer();
         }
 
-        var maybe_timeout: ?usize = null;
-        for (layers) |layer| {
-            for (layer) |widget| {
-                if (try widget.calculateTimeout(context)) |widget_timeout| {
-                    if (maybe_timeout == null or widget_timeout < maybe_timeout.?) maybe_timeout = widget_timeout;
-                }
-            }
-        }
-
         if (inactivity_event_fn) |inactivity_fn| {
             const time = try interop.getTimeOfDay();
 
@@ -257,7 +249,7 @@ pub fn runEventLoop(
 
         const event_error = if (maybe_timeout) |timeout| termbox.tb_peek_event(&event, @intCast(timeout)) else termbox.tb_poll_event(&event);
 
-        self.update = maybe_timeout != null;
+        self.update = maybe_timeout != null or event_error >= 0;
 
         if (event_error < 0) continue;