language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-27 12:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Prepare for allowing an item mouse handler to request focus

Browse source 
In the future the TextInput will request focus on mouse click,for
example.

Pass the outer-most component through to ItemVTable's input_event.

For the purpose of disambiguating this component from any nested
component instantiated by a repeater or so, it's called the
app_component.

The ComponentVTable takes a reference to a ComponentRefPin instead of a
ComponentRefPin by value, as the vtable macro gets confused otherwise
and thinks it's a self argument.
This commit is contained in:
Simon Hausmann 2020-09-24 15:14:18 +02:00
parent 0cb827a901
commit 2b76e9277a
12 changed files with 110 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/sixtyfps-cpp/include/sixtyfps.h
View file

@ -140,7 +140,8 @@ namespace private_api {
template<typename GetDynamic>
inline InputEventResult process_input_event(ComponentRef component, int64_t &mouse_grabber,
MouseEvent mouse_event, Slice<ItemTreeNode> tree,
GetDynamic get_dynamic, const ComponentWindow *window)
GetDynamic get_dynamic, const ComponentWindow *window,
const ComponentRef *app_component)
{
if (mouse_grabber != -1) {
auto item_index = mouse_grabber & 0xffffffff;
@ -157,11 +158,11 @@ inline InputEventResult process_input_event(ComponentRef component, int64_t &mou
reinterpret_cast<char *>(component.instance)
+ item_node.item.item.offset,
},
mouse_event, window);
mouse_event, window, *app_component);
break;
case ItemTreeNode::Tag::DynamicTree: {
ComponentRef comp = get_dynamic(item_node.dynamic_tree.index, rep_index);
result = comp.vtable->input_event(comp, mouse_event, window);
result = comp.vtable->input_event(comp, mouse_event, window, app_component);
} break;
}
if (result != InputEventResult::GrabMouse) {
@ -169,8 +170,8 @@ inline InputEventResult process_input_event(ComponentRef component, int64_t &mou
}
return result;
} else {
return cbindgen_private::sixtyfps_process_ungrabbed_mouse_event(component, mouse_event,
window, &mouse_grabber);
return cbindgen_private::sixtyfps_process_ungrabbed_mouse_event(
component, mouse_event, window, *app_component, &mouse_grabber);
}
}
}