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

Make the focused button to take the focus inside frame. (#371)

Browse Source 
This resolves:
https://github.com/ArthurSonzogni/FTXUI/issues/370
This commit is contained in:
Arthur Sonzogni
2022-04-03 15:04:33 +02:00
committed by GitHub
parent aebde94352
commit 9f610a0110
4 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ftxui/component/button.cpp
View File

@@ -69,22 +69,27 @@ Component Button(ConstStringRef label,
// Component implementation:
Element Render() override {
float target = Focused() ? 1.F : 0.F; // NOLINT
const bool active = Active();
const bool focused = Focused();
const bool focused_or_hover = focused || mouse_hover_;
float target = focused_or_hover ? 1.F : 0.F; // NOLINT
if (target != animator_background_.to()) {
SetAnimationTarget(target);
}
auto focus_management = focused ? focus : active ? select : nothing;
EntryState state = {
*label_,
false,
Active(),
Focused(),
active,
focused_or_hover,
};
auto element =
(option_->transform ? option_->transform : DefaultTransform) //
(state);
return element | AnimatedColorStyle() | reflect(box_);
return element | AnimatedColorStyle() | focus_management | reflect(box_);
}
Decorator AnimatedColorStyle() {
@@ -151,10 +156,9 @@ Component Button(ConstStringRef label,
return false;
}
TakeFocus();
if (event.mouse().button == Mouse::Left &&
event.mouse().motion == Mouse::Pressed) {
TakeFocus();
OnClick();
return true;
}