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

Split frame into {x,y}frame

Browse Source
This commit is contained in:
ArthurSonzogni 2020-06-07 15:54:45 +02:00 committed by Arthur Sonzogni
parent 08ee49f3e6
commit d2b991d5a3
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/ftxui/dom/elements.hpp
View File

@ -19,6 +19,14 @@ using Elements = std::vector<Element>;
using Decorator = std::function<Element(Element)>; using Decorator = std::function<Element(Element)>;
using GraphFunction = std::function<std::vector<int>(int, int)>; using GraphFunction = std::function<std::vector<int>(int, int)>;
// Pipe elements into decorator togethers.
// For instance the next lines are equivalents:
// -> text("ftxui") | bold | underlined
// -> underlined(bold(text(L"FTXUI")))
Element operator|(Element, Decorator);
Elements operator|(Elements, Decorator);
Decorator operator|(Decorator, Decorator);
// --- Widget --- // --- Widget ---
Element text(std::wstring text); Element text(std::wstring text);
Element vtext(std::wstring text); Element vtext(std::wstring text);
@ -69,6 +77,8 @@ Decorator size(Direction, Constraint, int value);
// the external one. The internal area is scrolled in order to make visible the // the external one. The internal area is scrolled in order to make visible the
// focused element. // focused element.
Element frame(Element); Element frame(Element);
Element xframe(Element);
Element yframe(Element);
Element focus(Element); Element focus(Element);
Element select(Element); Element select(Element);
@ -79,12 +89,6 @@ Element center(Element);
Element align_right(Element); Element align_right(Element);
Element nothing(Element element); Element nothing(Element element);
// Pipe elements into decorator togethers.
// Examples: text("ftxui") | bold | underlined;
Element operator|(Element, Decorator);
Elements operator|(Elements, Decorator);
Decorator operator|(Decorator, Decorator);
// Make container able to take any number of children as input. // Make container able to take any number of children as input.
#include "take_any_args.hpp" #include "take_any_args.hpp"
TAKE_ANY_ARGS(vbox) TAKE_ANY_ARGS(vbox)

74
src/ftxui/dom/frame.cpp
View File

@ -63,7 +63,7 @@ Element focus(Element child) {
class Frame : public Node { class Frame : public Node {
public: public:
Frame(std::vector<Element> children) : Node(std::move(children)) {} Frame(std::vector<Element> children, bool x_frame, bool y_frame) : Node(std::move(children)), x_frame_(x_frame), y_frame_(y_frame) {}
void ComputeRequirement() override { void ComputeRequirement() override {
Node::ComputeRequirement(); Node::ComputeRequirement();
@ -72,46 +72,30 @@ class Frame : public Node {
void SetBox(Box box) override { void SetBox(Box box) override {
Node::SetBox(box); Node::SetBox(box);
int external_dimx = box.x_max - box.x_min;
int external_dimy = box.y_max - box.y_min;
int internal_dimx = std::max(requirement_.min_x, external_dimx);
int internal_dimy = std::max(requirement_.min_y, external_dimy);
auto& selected_box = requirement_.selected_box; auto& selected_box = requirement_.selected_box;
int focused_dimx = selected_box.x_max - selected_box.x_min;
int focused_dimy = selected_box.y_max - selected_box.y_min;
int dx = selected_box.x_min - external_dimx / 2 + focused_dimx / 2;
int dy = selected_box.y_min - external_dimy / 2 + focused_dimy / 2;
dx = std::max(0, std::min(internal_dimx - external_dimx - 1, dx));
dy = std::max(0, std::min(internal_dimy - external_dimy - 1, dy));
Box children_box = box; Box children_box = box;
children_box.x_min = box.x_min - dx;
children_box.y_min = box.y_min - dy; if (x_frame_) {
children_box.x_max = box.x_min + internal_dimx - dx; int external_dimx = box.x_max - box.x_min;
children_box.y_max = box.y_min + internal_dimy - dy; int internal_dimx = std::max(requirement_.min_x, external_dimx);
int focused_dimx = selected_box.x_max - selected_box.x_min;
int dx = selected_box.x_min - external_dimx / 2 + focused_dimx / 2;
dx = std::max(0, std::min(internal_dimx - external_dimx - 1, dx));
children_box.x_min = box.x_min - dx;
children_box.x_max = box.x_min + internal_dimx - dx;
}
if (y_frame_) {
int external_dimy = box.y_max - box.y_min;
int internal_dimy = std::max(requirement_.min_y, external_dimy);
int focused_dimy = selected_box.y_max - selected_box.y_min;
int dy = selected_box.y_min - external_dimy / 2 + focused_dimy / 2;
dy = std::max(0, std::min(internal_dimy - external_dimy - 1, dy));
children_box.y_min = box.y_min - dy;
children_box.y_max = box.y_min + internal_dimy - dy;
}
children[0]->SetBox(children_box); children[0]->SetBox(children_box);
// int dx = box.x_max - box.x_min;
// int dy = box.y_max - box.y_min;
// int cdx = std::min(children[0].requirement().min_x
// Box children_box;
// children_box.x_min =
// if (box.x_max - box.x_min >= children[0].requirement().min_x && //
// box.y_max - box.y_min >= children[0].requirement().min_y) {
// children_[0]->SetBox(box);
// dx = 0;
// dy = 0;
// return;
//}
// Box children_box;
// children_box.x_min = box.x_min;
// children_box.y_min = box.x_min;
} }
void Render(Screen& screen) override { void Render(Screen& screen) override {
@ -119,10 +103,22 @@ class Frame : public Node {
Box::Intersection(box_, screen.stencil)); Box::Intersection(box_, screen.stencil));
children[0]->Render(screen); children[0]->Render(screen);
} }
private:
bool x_frame_;
bool y_frame_;
}; };
Element frame(Element child) { Element frame(Element child) {
return std::make_shared<Frame>(unpack(std::move(child))); return std::make_shared<Frame>(unpack(std::move(child)), true, true);
}
Element xframe(Element child) {
return std::make_shared<Frame>(unpack(std::move(child)), true, false);
}
Element yframe(Element child) {
return std::make_shared<Frame>(unpack(std::move(child)), false, true);
} }
} // namespace ftxui } // namespace ftxui