RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:58:11 +00:00
Code Issues Activity Actions

VisualBuilder: Use NonnullRefPtrVector.

Browse source
This commit is contained in:
Andreas Kling 2019-06-27 13:49:26 +02:00
parent d403e56494
commit 65e470c90a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
DevTools/VisualBuilder/VBForm.cpp
View file

@ -89,9 +89,9 @@ void VBForm::second_paint_event(GPaintEvent& event)
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
for (auto& widget : m_widgets) { for (auto& widget : m_widgets) {
if (widget->is_selected()) { if (widget.is_selected()) {
for_each_direction([&](Direction direction) { for_each_direction([&](auto direction) {
painter.fill_rect(widget->grabber_rect(direction), Color::Black); painter.fill_rect(widget.grabber_rect(direction), Color::Black);
}); });
} }
} }
@ -128,19 +128,19 @@ void VBForm::keydown_event(GKeyEvent& event)
if (m_widgets.is_empty()) if (m_widgets.is_empty())
return; return;
if (m_selected_widgets.is_empty()) { if (m_selected_widgets.is_empty()) {
set_single_selected_widget(m_widgets.first()); set_single_selected_widget(&m_widgets.first());
update(); update();
return; return;
} }
int selected_widget_index = 0; int selected_widget_index = 0;
for (; selected_widget_index < m_widgets.size(); ++selected_widget_index) { for (; selected_widget_index < m_widgets.size(); ++selected_widget_index) {
if (m_widgets[selected_widget_index] == *m_selected_widgets.begin()) if (&m_widgets[selected_widget_index] == *m_selected_widgets.begin())
break; break;
} }
++selected_widget_index; ++selected_widget_index;
if (selected_widget_index == m_widgets.size()) if (selected_widget_index == m_widgets.size())
selected_widget_index = 0; selected_widget_index = 0;
set_single_selected_widget(m_widgets[selected_widget_index]); set_single_selected_widget(&m_widgets[selected_widget_index]);
update(); update();
return; return;
} }
@ -318,7 +318,7 @@ void VBForm::write_to_file(const String& path)
JsonArray widget_array; JsonArray widget_array;
for (auto& widget : m_widgets) { for (auto& widget : m_widgets) {
JsonObject widget_object; JsonObject widget_object;
widget->for_each_property([&](auto& property) { widget.for_each_property([&](auto& property) {
if (property.value().is_bool()) if (property.value().is_bool())
widget_object.set(property.name(), property.value().to_bool()); widget_object.set(property.name(), property.value().to_bool());
else if (property.value().is_int()) else if (property.value().is_int())
@ -340,7 +340,7 @@ void VBForm::dump()
int i = 0; int i = 0;
for (auto& widget : m_widgets) { for (auto& widget : m_widgets) {
dbgprintf("[Widget %d]\n", i++); dbgprintf("[Widget %d]\n", i++);
widget->for_each_property([](auto& property) { widget.for_each_property([](auto& property) {
dbgprintf("%s=%s\n", property.name().characters(), property.value().to_string().characters()); dbgprintf("%s=%s\n", property.name().characters(), property.value().to_string().characters());
}); });
dbgprintf("\n"); dbgprintf("\n");

4
DevTools/VisualBuilder/VBForm.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "VBWidget.h" #include "VBWidget.h"
#include <AK/Vector.h> #include <AK/NonnullRefPtrVector.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
class VBForm : public GWidget { class VBForm : public GWidget {
@ -52,7 +52,7 @@ private:
String m_name; String m_name;
int m_grid_size { 5 }; int m_grid_size { 5 };
bool m_should_snap_to_grid { true }; bool m_should_snap_to_grid { true };
Vector<NonnullRefPtr<VBWidget>> m_widgets; NonnullRefPtrVector<VBWidget> m_widgets;
HashMap<GWidget*, VBWidget*> m_gwidget_map; HashMap<GWidget*, VBWidget*> m_gwidget_map;
HashTable<VBWidget*> m_selected_widgets; HashTable<VBWidget*> m_selected_widgets;
Point m_transform_event_origin; Point m_transform_event_origin;