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

25
src/ftxui/component/menu.cpp
View File

@@ -6,16 +6,21 @@
namespace ftxui {
Element Menu::Render() {
std::vector<Element> elements;
bool is_focused = Focused();
Elements elements;
bool is_menu_focused = Focused();
boxes_.resize(entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
auto style = (selected != int(i))
? normal_style
: is_focused ? focused_style : selected_style;
auto focused = (selected != int(i)) ? nothing : is_focused ? focus : select;
auto icon = (selected != int(i)) ? L" " : L"> ";
elements.push_back(text(icon + entries[i]) | style | focused |
bool is_focused = (focused == int(i)) && is_menu_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_menu_focused ? focus
: select;
auto icon = is_selected ? L"> " : L" ";
elements.push_back(text(icon + entries[i]) | style | focus_management |
reflect(boxes_[i]));
}
return vbox(std::move(elements));
@@ -41,6 +46,7 @@ bool Menu::OnEvent(Event event) {
selected = std::max(0, std::min(int(entries.size()) - 1, selected));
if (selected != old_selected) {
focused = selected;
on_change();
return true;
}
@@ -58,10 +64,11 @@ bool Menu::OnMouseEvent(Event event) {
if (!boxes_[i].Contain(event.mouse_x(), event.mouse_y()))
continue;
focused = i;
if (event.is_mouse_left_down()) {
TakeFocus();
if (selected != i) {
selected = i;
TakeFocus();
on_change();
}
return true;