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

Cleaner code

Browse Source
This commit is contained in:
Clement Roblot 2024-08-02 22:48:13 +07:00
parent 27424d5c20
commit 10a4a04529
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/component/input.cpp
View File

@ -68,10 +68,9 @@ int main() {
text("select_end " + std::to_string(selection.endx) + ";" + std::to_string(selection.endy)),
text("textToCopy " + textToCopy)
}) |
border | selected(selection, textToCopy, [&textToCopy](std::string selected){textToCopy = selected;});
border | selected(selection, [&textToCopy](std::string selected){textToCopy = selected;});
});
// TODO: Make the textToCopy a callback called every times the selected text change
// TODO: Is there a way for me to embedd the catchEvent in the selected decorator? At a minimum move the function in the selected.cpp file and add doc to call it
// TODO: Implement the double click on word to select the word
// TODO: Implement the double click and drag to select word by word (optional)

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

@ -104,8 +104,8 @@ Element canvas(std::function<void(Canvas&)>);
Element bold(Element);
Element dim(Element);
Element inverted(Element);
Element selected(Region &selection, std::string &destination, std::function<void(const std::string)> onSelectionChange, Element);
Decorator selected(Region &selection, std::string &destination, std::function<void(const std::string)> onSelectionChange);
Element selected(Region &selection, std::function<void(const std::string)> onSelectionChange, Element);
Decorator selected(Region &selection, std::function<void(const std::string)> onSelectionChange);
Element underlined(Element);
Element underlinedDouble(Element);
Element blink(Element);

20
src/ftxui/dom/selected.cpp
View File

@ -16,26 +16,24 @@ namespace {
class Selected : public NodeDecorator {
public:
using NodeDecorator::NodeDecorator;
Selected(Element child, Region &selection, std::string &destination, std::function<void(const std::string)> onSelectionChange)
: NodeDecorator(std::move(child)), selection_(selection), destination_(destination), onSelectionChange_(onSelectionChange) {}
Selected(Element child, Region &selection, std::function<void(const std::string)> onSelectionChange)
: NodeDecorator(std::move(child)), selection_(selection), onSelectionChange_(onSelectionChange) {}
void Render(Screen& screen) override {
Node::Render(screen);
destination_ = "";
std::string textToCopy = "";
std::string selectedText = "";
for (int y = std::min(selection_.starty, selection_.endy); y <= std::max(selection_.starty, selection_.endy); ++y) {
for (int x = std::min(selection_.startx, selection_.endx); x <= std::max(selection_.startx, selection_.endx)-1; ++x) {
screen.PixelAt(x, y).inverted ^= true;
textToCopy += screen.PixelAt(x, y).character;
selectedText += screen.PixelAt(x, y).character;
}
}
onSelectionChange_(textToCopy);
onSelectionChange_(selectedText);
}
private:
Region &selection_;
std::string &destination_;
std::function<void(const std::string)> onSelectionChange_;
};
} // namespace
@ -44,12 +42,12 @@ private:
/// colors.
/// @ingroup dom
Element selected(Region &selection, std::string &destination, std::function<void(const std::string)> onSelectionChange, Element child) {
return std::make_shared<Selected>(std::move(child), selection, destination, onSelectionChange);
Element selected(Region &selection, std::function<void(const std::string)> onSelectionChange, Element child) {
return std::make_shared<Selected>(std::move(child), selection, onSelectionChange);
}
Decorator selected(Region &selection, std::string &destination, std::function<void(const std::string)> onSelectionChange) {
return [&selection, &destination, onSelectionChange](Element child) { return selected(selection, destination, onSelectionChange, std::move(child)); };
Decorator selected(Region &selection, std::function<void(const std::string)> onSelectionChange) {
return [&selection, onSelectionChange](Element child) { return selected(selection, onSelectionChange, std::move(child)); };
}
} // namespace ftxui