RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:37:35 +00:00
Code Issues Activity Actions

VisualBuilder: Fix hit testing for composite widgets

Browse source 
When we ask LibGUI to hit test, it may return a subwidget of a widget
composed of many smaller widgets. In those cases we need to locate the
appropriate corresponding VBWidget for the composite widget.
This commit is contained in:
Andreas Kling 2019-09-17 21:11:52 +02:00
parent b37fc9f655
commit 5e439bb3c8
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
DevTools/VisualBuilder/VBForm.cpp
View file

@ -113,7 +113,13 @@ VBWidget* VBForm::widget_at(const Point& position)
auto result = hit_test(position, GWidget::ShouldRespectGreediness::No); auto result = hit_test(position, GWidget::ShouldRespectGreediness::No);
if (!result.widget) if (!result.widget)
return nullptr; return nullptr;
return m_gwidget_map.get(result.widget).value_or(nullptr); auto* gwidget = result.widget;
while (gwidget) {
if (auto* widget = m_gwidget_map.get(gwidget).value_or(nullptr))
return widget;
gwidget = gwidget->parent_widget();
}
return nullptr;
} }
void VBForm::grabber_mousedown_event(GMouseEvent& event, Direction grabber) void VBForm::grabber_mousedown_event(GMouseEvent& event, Direction grabber)
@ -411,9 +417,12 @@ void VBForm::delete_selected_widgets()
for_each_selected_widget([&](auto& widget) { for_each_selected_widget([&](auto& widget) {
to_delete.append(&widget); to_delete.append(&widget);
}); });
if (to_delete.is_empty())
return;
for (auto& widget : to_delete) for (auto& widget : to_delete)
m_widgets.remove_first_matching([&widget](auto& entry) { return entry == widget; }); m_widgets.remove_first_matching([&widget](auto& entry) { return entry == widget; });
on_widget_selected(single_selected_widget()); on_widget_selected(single_selected_widget());
update();
} }
template<typename Callback> template<typename Callback>