From 27424d5c205aeb5595dbfb5b67419bac5b96a496 Mon Sep 17 00:00:00 2001 From: Clement Roblot Date: Fri, 2 Aug 2024 22:45:50 +0700 Subject: [PATCH] Implemented a callback --- examples/component/input.cpp | 4 ++-- include/ftxui/dom/elements.hpp | 4 ++-- src/ftxui/dom/selected.cpp | 18 +++++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/examples/component/input.cpp b/examples/component/input.cpp index 0e9aa1b..cae9826 100644 --- a/examples/component/input.cpp +++ b/examples/component/input.cpp @@ -68,11 +68,11 @@ int main() { text("select_end " + std::to_string(selection.endx) + ";" + std::to_string(selection.endy)), text("textToCopy " + textToCopy) }) | - border | selected(selection, textToCopy); + border | selected(selection, textToCopy, [&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? + // 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) // TODO: Add a "selectable" flag in the pixel class and take it into account when selecting things diff --git a/include/ftxui/dom/elements.hpp b/include/ftxui/dom/elements.hpp index 374bb5f..458c839 100644 --- a/include/ftxui/dom/elements.hpp +++ b/include/ftxui/dom/elements.hpp @@ -104,8 +104,8 @@ Element canvas(std::function); Element bold(Element); Element dim(Element); Element inverted(Element); -Element selected(Region &selection, std::string &destination, Element); -Decorator selected(Region &selection, std::string &destination); +Element selected(Region &selection, std::string &destination, std::function onSelectionChange, Element); +Decorator selected(Region &selection, std::string &destination, std::function onSelectionChange); Element underlined(Element); Element underlinedDouble(Element); Element blink(Element); diff --git a/src/ftxui/dom/selected.cpp b/src/ftxui/dom/selected.cpp index 9adfe44..d1fc5a6 100644 --- a/src/ftxui/dom/selected.cpp +++ b/src/ftxui/dom/selected.cpp @@ -16,23 +16,27 @@ namespace { class Selected : public NodeDecorator { public: using NodeDecorator::NodeDecorator; - Selected(Element child, Region &selection, std::string &destination) - : NodeDecorator(std::move(child)), selection_(selection), destination_(destination) {} + Selected(Element child, Region &selection, std::string &destination, std::function onSelectionChange) + : NodeDecorator(std::move(child)), selection_(selection), destination_(destination), onSelectionChange_(onSelectionChange) {} void Render(Screen& screen) override { Node::Render(screen); destination_ = ""; + std::string textToCopy = ""; 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; - destination_ += screen.PixelAt(x, y).character; + textToCopy += screen.PixelAt(x, y).character; } } + + onSelectionChange_(textToCopy); } private: Region &selection_; std::string &destination_; + std::function onSelectionChange_; }; } // namespace @@ -40,12 +44,12 @@ private: /// colors. /// @ingroup dom -Element selected(Region &selection, std::string &destination, Element child) { - return std::make_shared(std::move(child), selection, destination); +Element selected(Region &selection, std::string &destination, std::function onSelectionChange, Element child) { + return std::make_shared(std::move(child), selection, destination, onSelectionChange); } -Decorator selected(Region &selection, std::string &destination) { - return [&selection, &destination](Element child) { return selected(selection, destination, std::move(child)); }; +Decorator selected(Region &selection, std::string &destination, std::function onSelectionChange) { + return [&selection, &destination, onSelectionChange](Element child) { return selected(selection, destination, onSelectionChange, std::move(child)); }; } } // namespace ftxui