amass/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2024-11-26 04:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Run clang-format.

Browse Source
This commit is contained in:
ArthurSonzogni 2020-03-27 01:42:46 +01:00
parent 1703552235
commit fce29a03b3
21 changed files with 104 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/component/homescreen.cpp
View File

@ -10,7 +10,6 @@
#include "ftxui/component/toggle.hpp"
#include "ftxui/screen/string.hpp"
using namespace ftxui;
int shift = 0;

11
examples/component/tab_vertical.cpp
View File

@ -22,11 +22,7 @@ class MyComponent : public Component {
container_.Add(&tab_container_);
menu_1_.entries = {
L"Forest",
L"Water",
L"I don't know"
};
menu_1_.entries = {L"Forest", L"Water", L"I don't know"};
tab_container_.Add(&menu_1_);
menu_2_.entries = {
@ -46,6 +42,7 @@ class MyComponent : public Component {
}
std::function<void()> on_enter = []() {};
private:
Menu menu_;
Container container_ = Container::Horizontal();
@ -55,9 +52,7 @@ class MyComponent : public Component {
Menu menu_3_;
};
int main(int argc, const char *argv[])
{
int main(int argc, const char* argv[]) {
auto screen = ScreenInteractive::TerminalOutput();
MyComponent component;
component.on_enter = screen.ExitLoopClosure();

1
examples/dom/gauge.cpp
View File

@ -5,7 +5,6 @@
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui;
using namespace std::chrono_literals;

1
examples/dom/graph.cpp
View File

@ -7,7 +7,6 @@
#include "ftxui/screen/screen.hpp"
#include "ftxui/screen/string.hpp"
class Graph {
public:
std::vector<int> operator()(int width, int height) {

5
examples/dom/spinner.cpp
View File

@ -2,12 +2,11 @@
#include <iostream>
#include <thread>
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
#include "ftxui/screen/string.hpp"
int main(int argc, const char *argv[])
{
int main(int argc, const char* argv[]) {
using namespace ftxui;
using namespace std::chrono_literals;

8
examples/dom/style_dim.cpp
View File

@ -1,9 +1,9 @@
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui;
// clang-format off
auto document =

8
examples/dom/style_gallery.cpp
View File

@ -1,9 +1,9 @@
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui;
// clang-format off
auto document =

8
examples/dom/style_inverted.cpp
View File

@ -1,9 +1,9 @@
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui;
// clang-format off
auto document =

8
examples/dom/style_underlined.cpp
View File

@ -1,9 +1,9 @@
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
int main(int argc, const char *argv[])
{
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui;
// clang-format off
auto document =

7
examples/dom/vbox_hbox.cpp
View File

@ -1,10 +1,9 @@
#include "ftxui/screen/screen.hpp"
#include "ftxui/dom/elements.hpp"
#include <iostream>
#include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp"
int main(int argc, const char *argv[])
{
int main(int argc, const char* argv[]) {
using namespace ftxui;
// clang-format off
auto document =

3
include/ftxui/component/receiver.hpp
View File

@ -1,11 +1,10 @@
#ifndef FTXUI_COMPONENT_RECEIVER_HPP_
#define FTXUI_COMPONENT_RECEIVER_HPP_
#include <iostream>
#include <atomic>
#include <condition_variable>
#include <functional>
#include <iostream>
#include <memory>
#include <mutex>
#include <queue>

1
src/ftxui/component/radiobox_test.cpp
View File

@ -75,5 +75,4 @@ TEST(RadioboxTest, Navigation) {
radiobox.OnEvent(Event::TabReverse);
EXPECT_EQ(radiobox.focused, 1);
radiobox.OnEvent(Event::TabReverse);
}

12
src/ftxui/component/receiver_test.cpp
View File

@ -58,10 +58,14 @@ TEST(Receiver, BasicWithThread) {
s1_bis.reset();
char c;
EXPECT_TRUE(r3->Receive(&c));EXPECT_EQ(c, '1');
EXPECT_TRUE(r3->Receive(&c)); EXPECT_EQ(c, '2');
EXPECT_TRUE(r3->Receive(&c)); EXPECT_EQ(c, '3');
EXPECT_TRUE(r3->Receive(&c)); EXPECT_EQ(c, '4');
EXPECT_TRUE(r3->Receive(&c));
EXPECT_EQ(c, '1');
EXPECT_TRUE(r3->Receive(&c));
EXPECT_EQ(c, '2');
EXPECT_TRUE(r3->Receive(&c));
EXPECT_EQ(c, '3');
EXPECT_TRUE(r3->Receive(&c));
EXPECT_EQ(c, '4');
EXPECT_FALSE(r3->Receive(&c));
// Thread will end at the end of the stream.

1
src/ftxui/component/toggle_test.cpp
View File

@ -70,5 +70,4 @@ TEST(ToggleTest, Tab) {
toggle.OnEvent(Event::TabReverse);
EXPECT_EQ(toggle.selected, 1);
toggle.OnEvent(Event::TabReverse);
}

55
src/ftxui/dom/hbox_test.cpp
View File

@ -6,10 +6,7 @@ using namespace ftxui;
using namespace ftxui;
TEST(HBoxTest, ScreenSmaller1) {
auto root = hbox(
text(L"text_1"),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), text(L"text_2"));
Screen screen(11, 1);
Render(screen, root.get());
@ -17,10 +14,7 @@ TEST(HBoxTest, ScreenSmaller1) {
}
TEST(HBoxTest, ScreenSmaller2) {
auto root = hbox(
text(L"text_1"),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), text(L"text_2"));
Screen screen(10, 1);
Render(screen, root.get());
@ -28,10 +22,7 @@ TEST(HBoxTest, ScreenSmaller2) {
}
TEST(HBoxTest, ScreenFit) {
auto root = hbox(
text(L"text_1"),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), text(L"text_2"));
Screen screen(12, 1);
Render(screen, root.get());
@ -39,20 +30,14 @@ TEST(HBoxTest, ScreenFit) {
}
TEST(HBoxTest, ScreenBigger1) {
auto root = hbox(
text(L"text_1"),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), text(L"text_2"));
Screen screen(13, 1);
Render(screen, root.get());
EXPECT_EQ("text_1text_2 ", screen.ToString());
}
TEST(HBoxTest, ScreenBigger2) {
auto root = hbox(
text(L"text_1"),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), text(L"text_2"));
Screen screen(14, 1);
Render(screen, root.get());
@ -60,11 +45,7 @@ TEST(HBoxTest, ScreenBigger2) {
}
TEST(HBoxTest, ScreenSmaller1Flex) {
auto root = hbox(
text(L"text_1"),
filler(),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), filler(), text(L"text_2"));
Screen screen(11, 1);
Render(screen, root.get());
@ -72,11 +53,7 @@ TEST(HBoxTest, ScreenSmaller1Flex) {
}
TEST(HBoxTest, ScreenSmaller2Flex) {
auto root = hbox(
text(L"text_1"),
filler(),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), filler(), text(L"text_2"));
Screen screen(10, 1);
Render(screen, root.get());
@ -84,11 +61,7 @@ TEST(HBoxTest, ScreenSmaller2Flex) {
}
TEST(HBoxTest, ScreenFitFlex) {
auto root = hbox(
text(L"text_1"),
filler(),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), filler(), text(L"text_2"));
Screen screen(12, 1);
Render(screen, root.get());
@ -96,11 +69,7 @@ TEST(HBoxTest, ScreenFitFlex) {
}
TEST(HBoxTest, ScreenBigger1Flex) {
auto root = hbox(
text(L"text_1"),
filler(),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), filler(), text(L"text_2"));
Screen screen(13, 1);
Render(screen, root.get());
@ -108,11 +77,7 @@ TEST(HBoxTest, ScreenBigger1Flex) {
}
TEST(HBoxTest, ScreenBigger2Flex) {
auto root = hbox(
text(L"text_1"),
filler(),
text(L"text_2")
);
auto root = hbox(text(L"text_1"), filler(), text(L"text_2"));
Screen screen(14, 1);
Render(screen, root.get());

2
src/ftxui/dom/vbox.cpp
View File

@ -1,5 +1,5 @@
#include <iostream>
#include <algorithm>
#include <iostream>
#include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp"

4
src/ftxui/dom/vbox_test.cpp
View File

@ -54,8 +54,8 @@ TEST(VBoxTest, ScreenFitFlex) {
" \n"
" \n"
" \n"
"text_2 "
,screen.ToString());
"text_2 ",
screen.ToString());
}
TEST(VBoxTest, ScreenBigger1Flex) {

1
src/ftxui/screen/screen.cpp
View File

@ -7,7 +7,6 @@
#include "ftxui/screen/string.hpp"
#include "ftxui/screen/terminal.hpp"
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX

1
src/ftxui/screen/string.cpp
View File

@ -3,7 +3,6 @@
#include <codecvt>
#include <locale>
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996) // codecvt_utf8_utf16 is deprecated

1
src/ftxui/screen/terminal.cpp
View File

@ -2,7 +2,6 @@
#include <stdio.h>
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX