Refactor directory structure.

The goal is to increase the separation in between:

 * ftxui::screen
 * ftxui::dom
 * ftxui::component
This commit is contained in:
Arthur Sonzogni
2019-01-06 17:10:35 +01:00
parent 1d29645cf5
commit 5887114793
70 changed files with 324 additions and 361 deletions

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -12,7 +12,7 @@ int main(int argc, const char *argv[])
text(L"blink") | blink,
text(L". Do you like it?")
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -12,7 +12,7 @@ int main(int argc, const char *argv[])
text(L"bold") | bold,
text(L". Do you like it?")
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -49,7 +49,7 @@ int main(int argc, const char *argv[])
filler()
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,11 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
auto document =
dbox(
frame(
@@ -22,7 +23,7 @@ int main(int argc, const char *argv[])
)
)
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -12,7 +12,7 @@ int main(int argc, const char *argv[])
text(L"dim") | dim,
text(L". Do you like it?")
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -2,12 +2,13 @@
#include <iostream>
#include <thread>
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
auto document =
hbox(
window(text(L" main frame ") | hcenter,
@@ -43,7 +44,7 @@ int main(int argc, const char *argv[])
),
filler()
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString() << std::endl;
}

View File

@@ -2,26 +2,30 @@
#include <iostream>
#include <thread>
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace std::chrono_literals;
std::string reset_position;
for(float percentage = 0; percentage <= 1.0; percentage+=0.002) {
std::wstring data_downloaded =
std::to_wstring(int(percentage * 5000)) + L"/5000";
using namespace ftxui::dom;
auto document =
hbox(
text(L"downloading:"),
gauge(percentage) | flex,
text(L" " + data_downloaded)
);
auto screen = ftxui::Screen(100, 1);
auto screen = Screen(100, 1);
Render(screen, document.get());
std::cout << '\r' << screen.ToString() << std::flush;
std::cout << reset_position << screen.ToString() << std::flush;
reset_position = screen.ResetPosition();
using namespace std::chrono_literals;
std::this_thread::sleep_for(0.01s);
}
std::cout << std::endl;

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -12,7 +12,7 @@ int main(int argc, const char *argv[])
text(L"inverted") | inverted,
text(L". Do you like it?")
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -2,17 +2,17 @@
#include <iostream>
#include <thread>
#include "ftxui/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/util/string.hpp"
#include <list>
#include <vector>
using namespace ftxui;
using namespace ftxui::dom;
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
struct Task {
std::wstring name;
int number_of_threads;
@@ -119,7 +119,7 @@ int main(int argc, const char *argv[])
// Draw.
auto document = render();
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << reset_position << screen.ToString() << std::flush;
reset_position = screen.ResetPosition();

View File

@@ -1,10 +1,11 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
auto document =
hbox(
text(L"left-column"),
@@ -15,7 +16,7 @@ int main(int argc, const char *argv[])
center(text(L"bottom-column"))
))
);
auto screen = ftxui::Screen::TerminalFullscreen();
auto screen = Screen::TerminalFullscreen();
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -17,7 +17,7 @@ int main(int argc, const char *argv[])
text(L"color") | color(Color::Blue) , text(L" ") ,
text(L"bgcolor") | bgcolor(Color::Blue)
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,10 +1,10 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
hbox(
@@ -12,7 +12,7 @@ int main(int argc, const char *argv[])
text(L"underlined") | underlined,
text(L". Do you like it?")
);
auto screen = ftxui::Screen::TerminalOutput(document);
auto screen = Screen::TerminalOutput(document);
Render(screen, document.get());
std::cout << screen.ToString();

View File

@@ -1,9 +1,11 @@
#include "ftxui/screen.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
auto document =
vbox(
@@ -27,7 +29,7 @@ int main(int argc, const char *argv[])
text(L"south-east")
)
);
auto screen = ftxui::Screen::TerminalFullscreen();
auto screen = Screen::TerminalFullscreen();
Render(screen, document.get());
std::cout << screen.ToString();