Fix scrolling and focus reallocation

tenzir · May 3, 2023 · 61d8134 · 61d8134
1 parent 5b78fe2
commit 61d8134
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/tui/src/components.cpp b/plugins/tui/src/components.cpp
@@ -62,7 +62,7 @@ auto RecordHeader(std::string top, const struct theme& theme) -> Component {
                    top_color = color(theme.palette.text),
                    focus_color = theme.focus_color()](bool focused) mutable {
     auto header = text(top_text) | bold | center;
-    return focused ? header | focus_color : header | top_color;
+    return focused ? header | focus | focus_color : header | top_color;
   });
 }
 

diff --git a/plugins/tui/src/ui_state.cpp b/plugins/tui/src/ui_state.cpp
@@ -28,7 +28,7 @@ auto Header(std::string top, std::string bottom, int height,
   return Renderer([height, &theme, top_text = std::move(top),
                    bottom_text = std::move(bottom)](bool focused) mutable {
     auto header = text(top_text) | bold | center;
-    header |= focused ? theme.focus_color() : color(theme.palette.text);
+    header |= focused ? focus | theme.focus_color() : color(theme.palette.text);
     auto element = vbox({
                      filler(),
                      std::move(header),
@@ -47,7 +47,8 @@ auto Cell(view<data> v, const struct theme& theme) -> Component {
     auto focus_color = theme.focus_color();
     return Renderer([=, element = text(to_string(x)),
                      normal_color = color(data_color)](bool focused) {
-      auto value = focused ? element | focus_color : element | normal_color;
+      auto value
+        = focused ? element | focus | focus_color : element | normal_color;
       switch (align) {
         case left:
           return value;