Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-11 10:18:15 +09:00
Code Activity

HackStudio: Allow moving widgets around using the CursorTool

Browse source 
You can now move the widgets around, either by themselves or in group
selections, by dragging them with the cursor tool. :^)
This commit is contained in:
Andreas Kling 2019-11-10 22:31:10 +01:00
parent f6576c4b7c
commit 567769eb2f
Notes: sideshowbarker 2024-07-19 11:16:39 +09:00
4 changed files with 79 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

66
DevTools/HackStudio/CursorTool.cpp
View file

@ -8,11 +8,27 @@ void CursorTool::on_mousedown(GMouseEvent& event)
dbg() << "CursorTool::on_mousedown";
auto& form_widget = m_editor.form_widget();
auto result = form_widget.hit_test(event.position(), GWidget::ShouldRespectGreediness::No);
if (result.widget && result.widget != &form_widget) {
if (event.modifiers() & Mod_Ctrl)
m_editor.selection().toggle(*result.widget);
else
m_editor.selection().set(*result.widget);
if (event.button() == GMouseButton::Left) {
if (result.widget && result.widget != &form_widget) {
if (event.modifiers() & Mod_Ctrl) {
m_editor.selection().toggle(*result.widget);
} else if (!event.modifiers()) {
if (!m_editor.selection().contains(*result.widget)) {
dbg() << "Selection didn't contain " << *result.widget << ", making it the only selected one";
m_editor.selection().set(*result.widget);
}
m_drag_origin = event.position();
m_positions_before_drag.clear();
m_editor.selection().for_each([&](auto& widget) {
m_positions_before_drag.set(&widget, widget.relative_position());
return IterationDecision::Continue;
});
}
} else {
m_editor.selection().clear();
}
// FIXME: Do we need to update any part of the FormEditorWidget outside the FormWidget?
form_widget.update();
}
@ -20,12 +36,48 @@ void CursorTool::on_mousedown(GMouseEvent& event)
void CursorTool::on_mouseup(GMouseEvent& event)
{
(void)event;
dbg() << "CursorTool::on_mouseup";
if (event.button() == GMouseButton::Left) {
auto& form_widget = m_editor.form_widget();
auto result = form_widget.hit_test(event.position(), GWidget::ShouldRespectGreediness::No);
if (!m_dragging && !(event.modifiers() & Mod_Ctrl)) {
if (result.widget && result.widget != &form_widget) {
m_editor.selection().set(*result.widget);
// FIXME: Do we need to update any part of the FormEditorWidget outside the FormWidget?
form_widget.update();
}
}
m_dragging = false;
}
}
void CursorTool::on_mousemove(GMouseEvent& event)
{
(void)event;
dbg() << "CursorTool::on_mousemove";
if (!m_dragging && event.buttons() & GMouseButton::Left && event.position() != m_drag_origin) {
auto& form_widget = m_editor.form_widget();
auto result = form_widget.hit_test(event.position(), GWidget::ShouldRespectGreediness::No);
if (result.widget && result.widget != &form_widget) {
if (!m_editor.selection().contains(*result.widget)) {
m_editor.selection().set(*result.widget);
// FIXME: Do we need to update any part of the FormEditorWidget outside the FormWidget?
form_widget.update();
}
}
m_dragging = true;
}
if (m_dragging) {
auto movement_delta = event.position() - m_drag_origin;
m_editor.selection().for_each([&](auto& widget) {
auto new_rect = widget.relative_rect();
new_rect.set_location(m_positions_before_drag.get(&widget).value_or({}).translated(movement_delta));
new_rect.set_x(new_rect.x() - (new_rect.x() % m_editor.form_widget().grid_size()));
new_rect.set_y(new_rect.y() - (new_rect.y() % m_editor.form_widget().grid_size()));
widget.set_relative_rect(new_rect);
return IterationDecision::Continue;
});
return;
}
}

8
DevTools/HackStudio/CursorTool.h
View file

@ -1,6 +1,10 @@
#pragma once
#include "Tool.h"
#include <AK/HashMap.h>
#include <LibDraw/Point.h>
class GWidget;
class CursorTool final : public Tool {
public:
@ -15,4 +19,8 @@ private:
virtual void on_mousedown(GMouseEvent&) override;
virtual void on_mouseup(GMouseEvent&) override;
virtual void on_mousemove(GMouseEvent&) override;
Point m_drag_origin;
HashMap<GWidget*, Point> m_positions_before_drag;
bool m_dragging { false };
};

9
DevTools/HackStudio/FormEditorWidget.h
View file

@ -60,6 +60,15 @@ public:
m_widgets.clear();
}
template<typename Callback>
void for_each(Callback callback)
{
for (auto& it : m_widgets) {
if (callback(*it) == IterationDecision::Break)
break;
}
}
WidgetSelection() {}
private:
HashTable<GWidget*> m_widgets;

4
DevTools/HackStudio/FormWidget.h
View file

@ -12,6 +12,9 @@ public:
FormEditorWidget& editor();
const FormEditorWidget& editor() const;
// FIXME: This should be an app-wide preference instead.
int grid_size() const { return m_grid_size; }
private:
virtual void paint_event(GPaintEvent&) override;
virtual void second_paint_event(GPaintEvent&) override;
@ -21,6 +24,5 @@ private:
explicit FormWidget(FormEditorWidget& parent);
// FIXME: This should be an app-wide preference instead.
int m_grid_size { 5 };
};