ui: Trigger recalculate_size per popup render so contents can readjust

1 files changed, 14 insertions, 7 deletions

diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 846cefb8..1bab1eae 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -16,8 +16,6 @@ pub struct Popup<T: Component> {
 }
 
 impl<T: Component> Popup<T> {
-    // TODO: it's like a slimmed down picker, share code? (picker = menu + prompt with different
-    // rendering)
     pub fn new(contents: T) -> Self {
         Self {
             contents,
@@ -38,20 +36,26 @@ impl<T: Component> Popup<T> {
 
         let (width, height) = self.size;
 
+        // if there's a orientation preference, use that
+        // if we're on the top part of the screen, do below
+        // if we're on the bottom part, do above
+
         // -- make sure frame doesn't stick out of bounds
         let mut rel_x = position.col as u16;
-        let rel_y = position.row as u16;
+        let mut rel_y = position.row as u16;
         if viewport.width <= rel_x + width {
             rel_x = rel_x.saturating_sub((rel_x + width).saturating_sub(viewport.width));
-        };
+        }
 
         // TODO: be able to specify orientation preference. We want above for most popups, below
         // for menus/autocomplete.
-        if height <= rel_y {
-            (rel_x, rel_y.saturating_sub(height)) // position above point
+        if viewport.height > rel_y + height {
+            rel_y += 1 // position below point
         } else {
-            (rel_x, rel_y + 1) // position below point
+            rel_y = rel_y.saturating_sub(height) // position above point
         }
+
+        (rel_x, rel_y)
     }
 
     pub fn get_size(&self) -> (u16, u16) {
@@ -133,6 +137,9 @@ impl<T: Component> Component for Popup<T> {
     }
 
     fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
+        // trigger required_size so we recalculate if the child changed
+        self.required_size((viewport.width, viewport.height));
+
         cx.scroll = Some(self.scroll);
 
         let (rel_x, rel_y) = self.get_rel_position(viewport, cx);