Pipeable decoration and the package_manager example.

- Pipeable decorator.
- package_manager example.

examples/dom/CMakeLists.txt

@@ -2,5 +2,6 @@ example(color)
 example(dbox)
 example(frame)
 example(gauge)
+example(package_manager)
 example(separator)
 example(vbox_hbox)

examples/dom/color.cpp

@@ -46,7 +46,7 @@ int main(int argc, const char *argv[])
         bgcolor(Color::Yellow, text(L"Yellow")),
         bgcolor(Color::YellowLight, text(L"YellowLight"))
       ),
-      flex()
+      filler()
     );
 
   auto screen = ftxui::Screen::TerminalOutput(document);

examples/dom/frame.cpp

@@ -10,7 +10,7 @@ int main(int argc, const char *argv[])
   using namespace ftxui::dom;
 	auto document =
 		hbox(
-			frame(hcenter(text(L" main frame ")),
+			window(hcenter(text(L" main frame ")),
 				vbox(
 					text(L"Line 1"),
 					text(L"Line 2"),
@@ -23,14 +23,14 @@ int main(int argc, const char *argv[])
 						)
 					),
 					hbox(
-						frame(text(L"frame 2"),
+						window(text(L"frame 2"),
 							vbox(
 								text(L"Line 4"),
 								text(L"Line 5"),
 								text(L"Line 6")
 							)
 						),
-						frame(text(L"frame 3"),
+						window(text(L"frame 3"),
 							vbox(
 								text(L"Line 7"),
 								text(L"Line 8"),
@@ -41,7 +41,7 @@ int main(int argc, const char *argv[])
 					text(L"footer footer footer footer footer")
 				)
 			),
-			flex()
+			filler()
 		);
   auto screen = ftxui::Screen::TerminalOutput(document);
   Render(screen, document.get());

examples/dom/gauge.cpp

@@ -14,7 +14,7 @@ int main(int argc, const char *argv[])
     auto document =
         hbox(
           text(L"downloading:"),
-          flex(gauge(percentage)),
+          gauge(percentage) | flex,
           text(L" " + data_downloaded)
         );
     auto screen = ftxui::Screen(100, 1);

examples/dom/package_manager.cpp

@@ -0,0 +1,123 @@
+#include <chrono>
+#include <iostream>
+#include <thread>
+
+#include "ftxui/screen.hpp"
+#include "ftxui/dom/elements.hpp"
+#include "ftxui/util/string.hpp"
+#include <list>
+#include <vector>
+
+using namespace ftxui;
+using namespace ftxui::dom;
+
+int main(int argc, const char *argv[])
+{
+  struct Task {
+    std::wstring name;
+    int number_of_threads;
+    int downloaded;
+    int size;
+  };
+
+  std::list<Task> remaining_tasks = {
+    {L"contact server       "  , 10 , 0 , 6*25} ,
+    {L"download index.html  "  , 10 , 0 , 9*25} ,
+    {L"download script.js   "  , 1 , 0 , 3*25} ,
+    {L"download style.js    "  , 1 , 0 , 4*25} ,
+    {L"download image.png   "  , 1 , 0 , 5*25}  ,
+    {L"download big_1.png   "  , 1 , 0 , 30*25}  ,
+    {L"download icon_1.png  "  , 1 , 0 , 7*25}  ,
+    {L"download icon_2.png  "  , 1 , 0 , 8*25}  ,
+    {L"download big_2.png   "  , 1 , 0 , 30*25}  ,
+    {L"download small_1.png "  , 1 , 0 , 10*25}  ,
+    {L"download small_2.png "  , 1 , 0 , 11*25}  ,
+    {L"download small_3.png "  , 1 , 0 , 12*25}  ,
+  };
+
+  std::list<Task> displayed_task;
+
+  int remaining_threads = 12;
+  std::string reset_position;
+
+  int nb_queued = remaining_tasks.size();
+  int nb_active = 0;
+  int nb_done = 0;
+
+  auto to_text = [](int number) {
+    std::wstring t = to_wstring(std::to_string(number));
+    while(t.size() < 3)
+      t = L" " + t;
+    return text(t);
+  };
+  
+  for(;;) {
+    std::vector<Element> entries;
+    for(auto& task : displayed_task) {
+      auto style = (task.downloaded == task.size) ? dim : bold;
+      entries.push_back(
+        hbox(
+          text(task.name) | style,
+          separator(),
+          to_text(task.downloaded),
+          text(L"/"),
+          to_text(task.size),
+          separator(),
+          gauge(task.downloaded / float(task.size))
+        )
+      );
+    }
+
+    auto document =
+      vbox(
+        window(text(L" Task "),
+          vbox(std::move(entries))
+        ),
+        hbox(
+          window(text(L" Summary "),
+            vbox(
+              hbox(text(L"- done:   "), to_text(nb_done) | bold) | color(Color::Green),
+              hbox(text(L"- active: "), to_text(nb_active) | bold ) | color(Color::RedLight),
+              hbox(text(L"- queue:  "), to_text(nb_queued) | bold) | color(Color::Red)
+            )
+          )
+        )
+      );
+
+    // Draw.
+    //if (step != 0) screen.Clear();
+    auto screen = ftxui::Screen::TerminalOutput(document);
+    Render(screen, document.get());
+    std::cout << reset_position << screen.ToString() << std::flush;
+    reset_position = screen.ResetPosition();
+
+    // Simulate time.
+    using namespace std::chrono_literals;
+    std::this_thread::sleep_for(0.01s);
+
+    if (nb_active + nb_queued == 0)
+      break;
+
+    // Update the model.
+    for(auto& task : displayed_task) {
+      if (task.downloaded != task.size) {
+        task.downloaded++;
+      } else if (task.number_of_threads) {
+        remaining_threads += task.number_of_threads;
+        task.number_of_threads = 0;
+        nb_active--;
+        nb_done++;
+      }
+    }
+
+    if (remaining_tasks.size() &&
+        remaining_tasks.front().number_of_threads <= remaining_threads) {
+      remaining_threads -= remaining_tasks.front().number_of_threads;
+      displayed_task.push_back(remaining_tasks.front());
+      remaining_tasks.pop_front();
+      nb_queued--;
+      nb_active++;
+    }
+  }
+  std::cout << std::endl;
+}

examples/dom/separator.cpp

@@ -10,7 +10,7 @@ int main(int argc, const char *argv[])
       text(L"left-column"),
       separator(),
       flex(vbox(
-        flex(center(text(L"right-column"))),
+        center(text(L"right-column")) | flex,
         separator(),
         center(text(L"bottom-column"))
       ))

examples/dom/vbox_hbox.cpp

@@ -9,21 +9,21 @@ int main(int argc, const char *argv[])
     vbox(
       hbox(
         text(L"north-west"),
-        flex(),
+        filler(),
         text(L"north-east")
       ),
-      flex(),
+      filler(),
       hbox(
         hbox(
-          flex(),
+          filler(),
           text(L"center"),
-          flex()
+          filler()
         )
       ),
-      flex(),
+      filler(),
       hbox(
         text(L"south-west"),
-        flex(),
+        filler(),
         text(L"south-east")
       )
     );