[layout] hide help if window is small

Also, when focusing the SQL prompt, select the overlay so
the user can scroll within it.

Author: tstack

src/listview_curses.cc

@@ -185,7 +185,6 @@ listview_curses::reload_data()
                 if (curr_sel == -1_vl) {
                     curr_sel = 0_vl;
                 }
-                this->lv_selection = -1_vl;
                 this->set_selection_without_context(curr_sel);
             }
 
@@ -969,6 +968,13 @@ listview_curses::handle_mouse(mouse_event& me)
                         {
                             this->lv_mouse_time = me.me_time;
                             this->lv_focused_overlay_top -= 1_vl;
+                            if (this->lv_focused_overlay_selection
+                                >= this->lv_focused_overlay_top + (oc.oc_height - 1_vl))
+                            {
+                                this->lv_focused_overlay_selection
+                                    = this->lv_focused_overlay_top
+                                    + oc.oc_height - 2_vl;
+                            }
                             this->set_needs_update();
                         }
 
@@ -986,8 +992,8 @@ listview_curses::handle_mouse(mouse_event& me)
                             }
                             this->set_needs_update();
                         }
-                        return true;
                     }
+                    return true;
                 }
             }
             this->shift_top(vis_line_t(scroll_polarity(me.me_button) * 2_vl),

src/lnav.cc

@@ -1850,12 +1850,13 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
             lnav_data.ld_view_stack.set_needs_update();
         }
         ncplane_resize_maximize(sc.get_std_plane());
-        if (lnav_data.ld_view_stack.do_update()) {
-            breadcrumb_view->set_needs_update();
-        }
         if (prompt.p_editor.get_needs_update()) {
             lnav_data.ld_doc_view.set_needs_update();
             lnav_data.ld_example_view.set_needs_update();
+            lnav_data.ld_view_stack.set_needs_update();
+        }
+        if (lnav_data.ld_view_stack.do_update()) {
+            breadcrumb_view->set_needs_update();
         }
         lnav_data.ld_doc_view.do_update();
         lnav_data.ld_example_view.do_update();

src/lnav_commands.cc

@@ -3628,6 +3628,7 @@ sql_prompt(std::vector<std::string>& args)
     fos->fos_contexts.top().c_show = true;
     tc->set_sync_selection_and_top(true);
     tc->reload_data();
+    tc->set_overlay_selection(3_vl);
     lnav_data.ld_bottom_source.set_prompt(
         "Enter an SQL query: (Press "
         ANSI_BOLD("CTRL+L") " for multi-line mode and "

src/view_helpers.cc

@@ -778,11 +778,10 @@ layout_views()
 
     bool breadcrumb_open = (lnav_data.ld_mode == ln_mode_t::BREADCRUMBS);
 
-    auto bottom_min = std::min(2U + 3U, height);
-    auto bottom = clamped<int>::from(height, bottom_min, height);
-
     auto prompt_height = prompt.p_editor.vc_enabled ? prompt.p_editor.tc_height
                                                     : 1;
+    auto min_height = std::min(prompt_height + 1U + 10 + 2U, height);
+    auto bottom = clamped<int>::from(height, min_height, height);
 
     bottom -= prompt_height;
     prompt.p_editor.set_y(bottom);
@@ -791,9 +790,7 @@ layout_views()
 
     breadcrumb_view->set_width(width);
 
-    bool vis;
-
-    vis = bottom.try_consume(um_height);
+    auto vis = bottom.try_consume(um_height);
     lnav_data.ld_user_message_view.set_y(bottom);
     lnav_data.ld_user_message_view.set_visible(vis);