Merge ee584c5fdd into 58ff448e76

include/ftxui/component/screen_interactive.hpp

@@ -39,6 +39,8 @@ class ScreenInteractive : public Screen {
   // Options. Must be called before Loop().
   void TrackMouse(bool enable = true);
 
+  void SetCursorReset(Screen::Cursor::Shape shape);
+
   // Return the currently active screen, nullptr if none.
   static ScreenInteractive* Active();
 

src/ftxui/component/screen_interactive.cpp

@@ -441,6 +441,11 @@ void ScreenInteractive::TrackMouse(bool enable) {
   track_mouse_ = enable;
 }
 
+/// @brief Set cursor shape on exit of main loop
+void ScreenInteractive::SetCursorReset(Screen::Cursor::Shape shape) {
+  cursor_reset_shape_ = shape;
+}
+
 /// @brief Add a task to the main loop.
 /// It will be executed later, after every other scheduled tasks.
 /// @ingroup component

src/ftxui/dom/border.cpp

@@ -65,7 +65,7 @@ class Border : public Node {
     if (children_.size() == 2) {
       Box title_box;
       title_box.x_min = box.x_min + 1;
-      title_box.x_max = box.x_max - 1;
+      title_box.x_max = std::min(box.x_max - 1, box.x_min + children_[1]->requirement().min_x);
       title_box.y_min = box.y_min;
       title_box.y_max = box.y_min;
       children_[1]->SetBox(title_box);