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

Improve mouse support for menu and toggle.

Browse Source
This commit is contained in:
ArthurSonzogni
2021-04-24 18:16:13 +02:00
parent 890a41a64c
commit 8037a5fa5f
14 changed files with 124 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ftxui/component/toggle.cpp
View File

@@ -5,22 +5,25 @@
namespace ftxui {
Element Toggle::Render() {
bool is_focused = Focused();
boxes_.resize(entries.size());
Elements children;
bool is_toggle_focused = Focused();
boxes_.resize(entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
// Separator.
if (i != 0)
children.push_back(separator());
// Entry.
auto style = (selected != int(i)) ? normal_style
: is_focused ? focused_style
: selected_style;
auto focused = (selected != int(i)) ? nothing : is_focused ? focus : select;
children.push_back(text(entries[i]) | style | focused | reflect(boxes_[i]));
bool is_focused = (focused == int(i)) && is_toggle_focused;
bool is_selected = (selected == int(i));
auto style = is_selected
? (is_focused ? selected_focused_style : selected_style)
: (is_focused ? focused_style : normal_style);
auto focus_management = !is_selected ? nothing
: is_toggle_focused ? focus
: select;
children.push_back(text(entries[i]) | style | focus_management |
reflect(boxes_[i]));
}
return hbox(std::move(children));
}
@@ -42,6 +45,7 @@ bool Toggle::OnEvent(Event event) {
selected = std::max(0, std::min(int(entries.size()) - 1, selected));
if (old_selected != selected) {
focused = selected;
on_change();
return true;
}
@@ -59,10 +63,12 @@ bool Toggle::OnMouseEvent(Event event) {
if (!boxes_[i].Contain(event.mouse_x(), event.mouse_y()))
continue;
TakeFocus();
focused = i;
if (event.is_mouse_left_down()) {
TakeFocus();
if (selected != i) {
selected = i;
TakeFocus();
on_change();
}
return true;