From d2b991d5a38a650f07007555bbb7dc0ad220ef5a Mon Sep 17 00:00:00 2001
From: ArthurSonzogni <sonzogniarthur@gmail.com>
Date: Sun, 7 Jun 2020 15:54:45 +0200
Subject: [PATCH] Split frame into {x,y}frame

---
 include/ftxui/dom/elements.hpp | 16 +++++---
 src/ftxui/dom/frame.cpp        | 74 ++++++++++++++++------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/include/ftxui/dom/elements.hpp b/include/ftxui/dom/elements.hpp
index 1ba984e..a3c0c91 100644
--- a/include/ftxui/dom/elements.hpp
+++ b/include/ftxui/dom/elements.hpp
@@ -19,6 +19,14 @@ using Elements = std::vector<Element>;
 using Decorator = std::function<Element(Element)>;
 using GraphFunction = std::function<std::vector<int>(int, int)>;
 
+// Pipe elements into decorator togethers.
+// For instance the next lines are equivalents:
+// -> text("ftxui") | bold | underlined 
+// -> underlined(bold(text(L"FTXUI")))
+Element operator|(Element, Decorator);
+Elements operator|(Elements, Decorator);
+Decorator operator|(Decorator, Decorator);
+
 // --- Widget ---
 Element text(std::wstring text);
 Element vtext(std::wstring text);
@@ -69,6 +77,8 @@ Decorator size(Direction, Constraint, int value);
 // the external one. The internal area is scrolled in order to make visible the
 // focused element.
 Element frame(Element);
+Element xframe(Element);
+Element yframe(Element);
 Element focus(Element);
 Element select(Element);
 
@@ -79,12 +89,6 @@ Element center(Element);
 Element align_right(Element);
 Element nothing(Element element);
 
-// Pipe elements into decorator togethers.
-// Examples: text("ftxui") | bold | underlined;
-Element operator|(Element, Decorator);
-Elements operator|(Elements, Decorator);
-Decorator operator|(Decorator, Decorator);
-
 // Make container able to take any number of children as input.
 #include "take_any_args.hpp"
 TAKE_ANY_ARGS(vbox)
diff --git a/src/ftxui/dom/frame.cpp b/src/ftxui/dom/frame.cpp
index e0dceaa..28af5ec 100644
--- a/src/ftxui/dom/frame.cpp
+++ b/src/ftxui/dom/frame.cpp
@@ -63,7 +63,7 @@ Element focus(Element child) {
 
 class Frame : public Node {
  public:
-  Frame(std::vector<Element> children) : Node(std::move(children)) {}
+  Frame(std::vector<Element> children, bool x_frame, bool y_frame) : Node(std::move(children)), x_frame_(x_frame), y_frame_(y_frame) {}
 
   void ComputeRequirement() override {
     Node::ComputeRequirement();
@@ -72,46 +72,30 @@ class Frame : public Node {
 
   void SetBox(Box box) override {
     Node::SetBox(box);
-
-    int external_dimx = box.x_max - box.x_min;
-    int external_dimy = box.y_max - box.y_min;
-
-    int internal_dimx = std::max(requirement_.min_x, external_dimx);
-    int internal_dimy = std::max(requirement_.min_y, external_dimy);
-
     auto& selected_box = requirement_.selected_box;
-    int focused_dimx = selected_box.x_max - selected_box.x_min;
-    int focused_dimy = selected_box.y_max - selected_box.y_min;
-    int dx = selected_box.x_min - external_dimx / 2 + focused_dimx / 2;
-    int dy = selected_box.y_min - external_dimy / 2 + focused_dimy / 2;
-    dx = std::max(0, std::min(internal_dimx - external_dimx - 1, dx));
-    dy = std::max(0, std::min(internal_dimy - external_dimy - 1, dy));
-
     Box children_box = box;
-    children_box.x_min = box.x_min - dx;
-    children_box.y_min = box.y_min - dy;
-    children_box.x_max = box.x_min + internal_dimx - dx;
-    children_box.y_max = box.y_min + internal_dimy - dy;
+
+    if (x_frame_) {
+      int external_dimx = box.x_max - box.x_min;
+      int internal_dimx = std::max(requirement_.min_x, external_dimx);
+      int focused_dimx = selected_box.x_max - selected_box.x_min;
+      int dx = selected_box.x_min - external_dimx / 2 + focused_dimx / 2;
+      dx = std::max(0, std::min(internal_dimx - external_dimx - 1, dx));
+      children_box.x_min = box.x_min - dx;
+      children_box.x_max = box.x_min + internal_dimx - dx;
+    }
+
+    if (y_frame_) {
+      int external_dimy = box.y_max - box.y_min;
+      int internal_dimy = std::max(requirement_.min_y, external_dimy);
+      int focused_dimy = selected_box.y_max - selected_box.y_min;
+      int dy = selected_box.y_min - external_dimy / 2 + focused_dimy / 2;
+      dy = std::max(0, std::min(internal_dimy - external_dimy - 1, dy));
+      children_box.y_min = box.y_min - dy;
+      children_box.y_max = box.y_min + internal_dimy - dy;
+    }
+
     children[0]->SetBox(children_box);
-
-    // int dx = box.x_max - box.x_min;
-    // int dy = box.y_max - box.y_min;
-    // int cdx = std::min(children[0].requirement().min_x
-
-    // Box children_box;
-    // children_box.x_min =
-    // if (box.x_max - box.x_min >= children[0].requirement().min_x && //
-
-    // box.y_max - box.y_min >= children[0].requirement().min_y) {
-    // children_[0]->SetBox(box);
-    // dx = 0;
-    // dy = 0;
-    // return;
-    //}
-
-    // Box children_box;
-    // children_box.x_min = box.x_min;
-    // children_box.y_min = box.x_min;
   }
 
   void Render(Screen& screen) override {
@@ -119,10 +103,22 @@ class Frame : public Node {
                            Box::Intersection(box_, screen.stencil));
     children[0]->Render(screen);
   }
+
+ private:
+  bool x_frame_;
+  bool y_frame_;
 };
 
 Element frame(Element child) {
-  return std::make_shared<Frame>(unpack(std::move(child)));
+  return std::make_shared<Frame>(unpack(std::move(child)), true, true);
+}
+
+Element xframe(Element child) {
+  return std::make_shared<Frame>(unpack(std::move(child)), true, false);
+}
+
+Element yframe(Element child) {
+  return std::make_shared<Frame>(unpack(std::move(child)), false, true);
 }
 
 }  // namespace ftxui