zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-09-16 16:08:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set clang-format macro indent.

Browse Source 
1) Set clang-format macro indent.
2) Run clang-format on every files.
This commit is contained in:
ArthurSonzogni
2020-03-23 21:26:00 +01:00
parent 9e71c467f6
commit 493e734680
30 changed files with 110 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/ftxui/component/checkbox.hpp
View File

@@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_CHECKBOX_HPP
#define FTXUI_COMPONENT_CHECKBOX_HPP
#include "ftxui/component/component.hpp"
#include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui {
class CheckBox : public Component {
@@ -15,8 +16,8 @@ class CheckBox : public Component {
bool state = false;
std::wstring label = L"label";
//std::wstring checked = L"[X] ";
//std::wstring unchecked = L"[ ] ";
// std::wstring checked = L"[X] ";
// std::wstring unchecked = L"[ ] ";
std::wstring checked = L"▣ ";
std::wstring unchecked = L"☐ ";
@@ -24,7 +25,7 @@ class CheckBox : public Component {
Decorator unfocused_style = nothing;
// State update callback.
std::function<void()> on_change = [](){};
std::function<void()> on_change = []() {};
// Component implementation.
Element Render() override;

1
include/ftxui/component/component.hpp
View File

@@ -11,7 +11,6 @@ class Focus;
class Component {
public:
// Constructor/Destructor.
Component() = default;
virtual ~Component();

7
include/ftxui/component/input.hpp
View File

@@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_INPUT_H_
#define FTXUI_COMPONENT_INPUT_H_
#include "ftxui/component/component.hpp"
#include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui {
class Input : public Component {
@@ -17,8 +18,8 @@ class Input : public Component {
std::wstring placeholder;
// State update callback.
std::function<void()> on_change = [](){};
std::function<void()> on_enter = [](){};
std::function<void()> on_change = []() {};
std::function<void()> on_enter = []() {};
// Component implementation.
Element Render() override;

9
include/ftxui/component/menu.hpp
View File

@@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_MENU
#define FTXUI_COMPONENT_MENU
#include <functional>
#include "ftxui/component/component.hpp"
#include "ftxui/dom/elements.hpp"
#include <functional>
namespace ftxui {
@@ -22,14 +23,14 @@ class Menu : public Component {
Decorator normal_style = nothing;
// State update callback.
std::function<void()> on_change = [](){};
std::function<void()> on_enter = [](){};
std::function<void()> on_change = []() {};
std::function<void()> on_enter = []() {};
// Component implementation.
Element Render() override;
bool OnEvent(Event) override;
};
} // namespace ftxui::Component
} // namespace ftxui
#endif /* end of include guard: FTXUI_COMPONENT_MENU */

5
include/ftxui/component/radiobox.hpp
View File

@@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_RADIOBOX_HPP
#define FTXUI_COMPONENT_RADIOBOX_HPP
#include "ftxui/component/component.hpp"
#include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui {
class RadioBox : public Component {
@@ -23,7 +24,7 @@ class RadioBox : public Component {
Decorator unfocused_style = nothing;
// State update callback.
std::function<void()> on_change = [](){};
std::function<void()> on_change = []() {};
// Component implementation.
Element Render() override;

54
include/ftxui/component/screen_interactive.hpp
View File

@@ -1,12 +1,12 @@
#ifndef FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP
#define FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP
#include <atomic>
#include <condition_variable>
#include <functional>
#include <memory>
#include <mutex>
#include <queue>
#include <atomic>
#include "ftxui/component/event.hpp"
#include "ftxui/screen/screen.hpp"
@@ -15,38 +15,38 @@ namespace ftxui {
class Component;
class ScreenInteractive : public Screen {
public:
static ScreenInteractive FixedSize(int dimx, int dimy);
static ScreenInteractive Fullscreen();
static ScreenInteractive FitComponent();
static ScreenInteractive TerminalOutput();
public:
static ScreenInteractive FixedSize(int dimx, int dimy);
static ScreenInteractive Fullscreen();
static ScreenInteractive FitComponent();
static ScreenInteractive TerminalOutput();
~ScreenInteractive();
void Loop(Component*);
std::function<void()> ExitLoopClosure();
~ScreenInteractive();
void Loop(Component*);
std::function<void()> ExitLoopClosure();
void PostEvent(Event event);
void PostEvent(Event event);
private:
void Draw(Component* component);
void EventLoop(Component* component);
private:
void Draw(Component* component);
void EventLoop(Component* component);
enum class Dimension {
FitComponent,
Fixed,
Fullscreen,
TerminalOutput,
};
Dimension dimension_ = Dimension::Fixed;
ScreenInteractive(int dimx, int dimy, Dimension dimension);
enum class Dimension {
FitComponent,
Fixed,
Fullscreen,
TerminalOutput,
};
Dimension dimension_ = Dimension::Fixed;
ScreenInteractive(int dimx, int dimy, Dimension dimension);
std::condition_variable events_queue_cv;
std::mutex events_queue_mutex;
std::queue<Event> events_queue;
std::atomic<bool> quit_ = false;
std::condition_variable events_queue_cv;
std::mutex events_queue_mutex;
std::queue<Event> events_queue;
std::atomic<bool> quit_ = false;
std::string set_cursor_position;
std::string reset_cursor_position;
std::string set_cursor_position;
std::string reset_cursor_position;
};
} // namespace ftxui

7
include/ftxui/component/toggle.hpp
View File

@@ -1,10 +1,11 @@
#ifndef FTXUI_COMPONENT_TOGGLE_H_
#define FTXUI_COMPONENT_TOGGLE_H_
#include "ftxui/component/component.hpp"
#include <functional>
#include <string>
#include "ftxui/component/component.hpp"
namespace ftxui {
class Toggle : public Component {
@@ -21,13 +22,13 @@ class Toggle : public Component {
Decorator normal_style = dim;
// Callback.
std::function<void()> on_change = [](){};
std::function<void()> on_change = []() {};
// Component implementation.
Element Render() override;
bool OnEvent(Event) override;
};
} // namespace ftxui::Component
} // namespace ftxui
#endif /* end of include guard: FTXUI_COMPONENT_TOGGLE_H_ */

3
include/ftxui/dom/node.hpp
View File

@@ -29,7 +29,8 @@ class Node {
// Step 3: Draw this element.
virtual void Render(Screen& screen);
std::vector<std::unique_ptr<Node>> children;
std::vector<std::unique_ptr<Node>> children;
protected:
Requirement requirement_;
Box box_;

12
include/ftxui/dom/requirement.hpp
View File

@@ -7,10 +7,16 @@ namespace ftxui {
struct Requirement {
// The required size to fully draw the element.
struct { int x = 0; int y = 0; } min;
struct {
int x = 0;
int y = 0;
} min;
// How much flexibility is given to the component.
struct { int x = 0; int y = 0; } flex;
struct {
int x = 0;
int y = 0;
} flex;
// Frame.
enum Selection {
@@ -21,6 +27,6 @@ struct Requirement {
Box selected_box;
};
} // namespace ftxui
} // namespace ftxui
#endif /* end of include guard: FTXUI_REQUIREMENT_HPP */

12
include/ftxui/dom/take_any_args.hpp
View File

@@ -10,7 +10,7 @@ inline void Merge(Elements& container, Element element) {
template <>
inline void Merge(Elements& container, Elements elements) {
for(auto& element : elements)
for (auto& element : elements)
container.push_back(std::move(element));
}
@@ -23,8 +23,8 @@ Elements unpack(Args... args) {
}
// Make |container| able to take any number of argments.
#define TAKE_ANY_ARGS(container) \
template <class... Args> \
Element container(Args... children) { \
return container(unpack(std::forward<Args>(children)...)); \
}
#define TAKE_ANY_ARGS(container) \
template <class... Args> \
Element container(Args... children) { \
return container(unpack(std::forward<Args>(children)...)); \
}

2
include/ftxui/screen/color.hpp
View File

@@ -35,6 +35,6 @@ enum class Color : uint8_t {
YellowLight = 93,
};
} // namespace ftxui
} // namespace ftxui
#endif /* end of include guard: FTXUI_COLOR_H_ */

10
include/ftxui/screen/screen.hpp
View File

@@ -1,15 +1,15 @@
#ifndef FTXUI_SCREEN_SCREEN
#define FTXUI_SCREEN_SCREEN
#include <memory>
#include <string>
#include <vector>
#include <memory>
#include "ftxui/screen/color.hpp"
#include "ftxui/screen/box.hpp"
#include "ftxui/screen/color.hpp"
namespace ftxui {
class Node;
class Node;
}
namespace ftxui {
@@ -49,8 +49,8 @@ class Screen {
std::string ToString();
// Get screen dimensions.
int dimx() { return dimx_;}
int dimy() { return dimy_;}
int dimx() { return dimx_; }
int dimy() { return dimy_; }
// Move the terminal cursor n-lines up with n = dimy().
std::string ResetPosition();

2
include/ftxui/screen/string.hpp
View File

@@ -6,7 +6,7 @@
std::string to_string(const std::wstring& s);
std::wstring to_wstring(const std::string& s);
template<typename T>
template <typename T>
std::wstring to_wstring(T s) {
return to_wstring(std::to_string(s));
}

8
include/ftxui/util/autoreset.hpp
View File

@@ -3,20 +3,20 @@
namespace ftxui {
template<typename T>
template <typename T>
class AutoReset {
public:
AutoReset(T* variable, T new_value)
: variable_(variable),
previous_value_(std::move(*variable)) {
: variable_(variable), previous_value_(std::move(*variable)) {
*variable_ = std::move(new_value);
}
~AutoReset() { *variable_ = std::move(previous_value_); }
private:
T* variable_;
T previous_value_;
};
} // namespace ftxui
} // namespace ftxui
#endif /* end of include guard: FTXUI_UTIL_AUTORESET_HPP */