Set clang-format macro indent.

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

View File

@ -2,3 +2,4 @@
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html # http://clang.llvm.org/docs/ClangFormatStyleOptions.html
BasedOnStyle: Chromium BasedOnStyle: Chromium
Standard: Cpp11 Standard: Cpp11
IndentPPDirectives: BeforeHash

View File

@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_CHECKBOX_HPP #ifndef FTXUI_COMPONENT_CHECKBOX_HPP
#define FTXUI_COMPONENT_CHECKBOX_HPP #define FTXUI_COMPONENT_CHECKBOX_HPP
#include "ftxui/component/component.hpp"
#include <functional> #include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui { namespace ftxui {
class CheckBox : public Component { class CheckBox : public Component {

View File

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

View File

@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_INPUT_H_ #ifndef FTXUI_COMPONENT_INPUT_H_
#define FTXUI_COMPONENT_INPUT_H_ #define FTXUI_COMPONENT_INPUT_H_
#include "ftxui/component/component.hpp"
#include <functional> #include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui { namespace ftxui {
class Input : public Component { class Input : public Component {

View File

@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_MENU #ifndef FTXUI_COMPONENT_MENU
#define FTXUI_COMPONENT_MENU #define FTXUI_COMPONENT_MENU
#include <functional>
#include "ftxui/component/component.hpp" #include "ftxui/component/component.hpp"
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include <functional>
namespace ftxui { namespace ftxui {
@ -30,6 +31,6 @@ class Menu : public Component {
bool OnEvent(Event) override; bool OnEvent(Event) override;
}; };
} // namespace ftxui::Component } // namespace ftxui
#endif /* end of include guard: FTXUI_COMPONENT_MENU */ #endif /* end of include guard: FTXUI_COMPONENT_MENU */

View File

@ -1,9 +1,10 @@
#ifndef FTXUI_COMPONENT_RADIOBOX_HPP #ifndef FTXUI_COMPONENT_RADIOBOX_HPP
#define FTXUI_COMPONENT_RADIOBOX_HPP #define FTXUI_COMPONENT_RADIOBOX_HPP
#include "ftxui/component/component.hpp"
#include <functional> #include <functional>
#include "ftxui/component/component.hpp"
namespace ftxui { namespace ftxui {
class RadioBox : public Component { class RadioBox : public Component {

View File

@ -1,12 +1,12 @@
#ifndef FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP #ifndef FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP
#define FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP #define FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP
#include <atomic>
#include <condition_variable> #include <condition_variable>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
#include <atomic>
#include "ftxui/component/event.hpp" #include "ftxui/component/event.hpp"
#include "ftxui/screen/screen.hpp" #include "ftxui/screen/screen.hpp"

View File

@ -1,10 +1,11 @@
#ifndef FTXUI_COMPONENT_TOGGLE_H_ #ifndef FTXUI_COMPONENT_TOGGLE_H_
#define FTXUI_COMPONENT_TOGGLE_H_ #define FTXUI_COMPONENT_TOGGLE_H_
#include "ftxui/component/component.hpp"
#include <functional> #include <functional>
#include <string> #include <string>
#include "ftxui/component/component.hpp"
namespace ftxui { namespace ftxui {
class Toggle : public Component { class Toggle : public Component {
@ -28,6 +29,6 @@ class Toggle : public Component {
bool OnEvent(Event) override; bool OnEvent(Event) override;
}; };
} // namespace ftxui::Component } // namespace ftxui
#endif /* end of include guard: FTXUI_COMPONENT_TOGGLE_H_ */ #endif /* end of include guard: FTXUI_COMPONENT_TOGGLE_H_ */

View File

@ -30,6 +30,7 @@ class Node {
virtual void Render(Screen& screen); virtual void Render(Screen& screen);
std::vector<std::unique_ptr<Node>> children; std::vector<std::unique_ptr<Node>> children;
protected: protected:
Requirement requirement_; Requirement requirement_;
Box box_; Box box_;

View File

@ -7,10 +7,16 @@ namespace ftxui {
struct Requirement { struct Requirement {
// The required size to fully draw the element. // 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. // 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. // Frame.
enum Selection { enum Selection {

View File

@ -1,12 +1,12 @@
#ifndef FTXUI_SCREEN_SCREEN #ifndef FTXUI_SCREEN_SCREEN
#define FTXUI_SCREEN_SCREEN #define FTXUI_SCREEN_SCREEN
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory>
#include "ftxui/screen/color.hpp"
#include "ftxui/screen/box.hpp" #include "ftxui/screen/box.hpp"
#include "ftxui/screen/color.hpp"
namespace ftxui { namespace ftxui {
class Node; class Node;

View File

@ -7,11 +7,11 @@ template<typename T>
class AutoReset { class AutoReset {
public: public:
AutoReset(T* variable, T new_value) AutoReset(T* variable, T new_value)
: variable_(variable), : variable_(variable), previous_value_(std::move(*variable)) {
previous_value_(std::move(*variable)) {
*variable_ = std::move(new_value); *variable_ = std::move(new_value);
} }
~AutoReset() { *variable_ = std::move(previous_value_); } ~AutoReset() { *variable_ = std::move(previous_value_); }
private: private:
T* variable_; T* variable_;
T previous_value_; T previous_value_;

View File

@ -1,7 +1,9 @@
#include "ftxui/component/input.hpp" #include "ftxui/component/input.hpp"
#include "ftxui/screen/string.hpp"
#include <algorithm> #include <algorithm>
#include "ftxui/screen/string.hpp"
namespace ftxui { namespace ftxui {
// Component implementation. // Component implementation.
@ -29,8 +31,7 @@ Element Input::Render() {
std::wstring part_after_cursor = cursor_position < (int)content.size() - 1 std::wstring part_after_cursor = cursor_position < (int)content.size() - 1
? content.substr(cursor_position + 1) ? content.substr(cursor_position + 1)
: L""; : L"";
auto focused = auto focused = is_focused ? focus : select;
is_focused ? focus : select;
// clang-format off // clang-format off
return return

View File

@ -1,7 +1,7 @@
#include "ftxui/component/menu.hpp" #include "ftxui/component/menu.hpp"
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <algorithm>
namespace ftxui { namespace ftxui {

View File

@ -1,6 +1,7 @@
#include "ftxui/component/radiobox.hpp" #include "ftxui/component/radiobox.hpp"
#include <functional>
#include <algorithm> #include <algorithm>
#include <functional>
namespace ftxui { namespace ftxui {

View File

@ -3,14 +3,16 @@
#include <stdio.h> #include <stdio.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <algorithm>
#include <csignal> #include <csignal>
#include <iostream> #include <iostream>
#include <stack> #include <stack>
#include <thread> #include <thread>
#include "ftxui/component/component.hpp" #include "ftxui/component/component.hpp"
#include "ftxui/screen/string.hpp" #include "ftxui/screen/string.hpp"
#include "ftxui/screen/terminal.hpp" #include "ftxui/screen/terminal.hpp"
#include <algorithm>
#if defined(__clang__) && defined(__APPLE__) #if defined(__clang__) && defined(__APPLE__)
// Quick exit is missing in standard CLang headers // Quick exit is missing in standard CLang headers
@ -47,9 +49,7 @@ void OnResize(int /* signal */) {
on_resize(); on_resize();
} }
ScreenInteractive::ScreenInteractive(int dimx, ScreenInteractive::ScreenInteractive(int dimx, int dimy, Dimension dimension)
int dimy,
Dimension dimension)
: Screen(dimx, dimy), dimension_(dimension) {} : Screen(dimx, dimy), dimension_(dimension) {}
ScreenInteractive::~ScreenInteractive() {} ScreenInteractive::~ScreenInteractive() {}
@ -176,8 +176,7 @@ void ScreenInteractive::Draw(Component* component) {
if (dimx != dimx_ || dimy != dimy_) { if (dimx != dimx_ || dimy != dimy_) {
dimx_ = dimx; dimx_ = dimx;
dimy_ = dimy; dimy_ = dimy;
pixels_ = std::vector<std::vector<Pixel>>( pixels_ = std::vector<std::vector<Pixel>>(dimy, std::vector<Pixel>(dimx));
dimy, std::vector<Pixel>(dimx));
cursor_.x = dimx_ - 1; cursor_.x = dimx_ - 1;
cursor_.y = dimy_ - 1; cursor_.y = dimy_ - 1;
} }

View File

@ -1,4 +1,5 @@
#include "ftxui/component/toggle.hpp" #include "ftxui/component/toggle.hpp"
#include <algorithm> #include <algorithm>
namespace ftxui { namespace ftxui {

View File

@ -1,8 +1,8 @@
#include <algorithm>
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
using namespace ftxui; using namespace ftxui;

View File

@ -1,8 +1,8 @@
#include <algorithm>
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
class DBox : public Node { class DBox : public Node {

View File

@ -4,8 +4,6 @@
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include "ftxui/util/autoreset.hpp" #include "ftxui/util/autoreset.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
using namespace ftxui; using namespace ftxui;

View File

@ -3,8 +3,6 @@
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
class HBox : public Node { class HBox : public Node {

View File

@ -1,8 +1,8 @@
#include <algorithm>
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
class HFlow : public Node { class HFlow : public Node {

View File

@ -3,8 +3,6 @@
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
class Size : public Node { class Size : public Node {

View File

@ -3,8 +3,6 @@
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/dom/node.hpp" #include "ftxui/dom/node.hpp"
#include <algorithm>
namespace ftxui { namespace ftxui {
class VBox : public Node { class VBox : public Node {

View File

@ -7,7 +7,6 @@
#include "ftxui/screen/string.hpp" #include "ftxui/screen/string.hpp"
#include "ftxui/screen/terminal.hpp" #include "ftxui/screen/terminal.hpp"
namespace ftxui { namespace ftxui {
namespace { namespace {

View File

@ -59,9 +59,10 @@
* Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
*/ */
#include "ftxui/screen/string.hpp"
#include <wchar.h> #include <wchar.h>
#include "ftxui/screen/string.hpp"
namespace { namespace {
struct interval { struct interval {
int first; int first;