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

LibCore: Make Core::Object::add<ChildType> return a ChildType&

Browse source 
Since the returned object is now owned by the callee object, we can
simply vend a ChildType&. This allows us to use "." instead of "->"
at the call site, which is quite nice. :^)
This commit is contained in:
Andreas Kling 2020-03-04 19:07:55 +01:00
parent fb09b6a8ce
commit 028c011760
46 changed files with 1035 additions and 1039 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Libraries/LibGUI/ColorPicker.cpp
View file

@ -53,11 +53,11 @@ void ColorPicker::build()
horizontal_container.set_layout<HorizontalBoxLayout>();
horizontal_container.layout()->set_margins({ 4, 4, 4, 4 });
auto left_vertical_container = horizontal_container.add<Widget>();
left_vertical_container->set_layout<VerticalBoxLayout>();
auto& left_vertical_container = horizontal_container.add<Widget>();
left_vertical_container.set_layout<VerticalBoxLayout>();
auto right_vertical_container = horizontal_container.add<Widget>();
right_vertical_container->set_layout<VerticalBoxLayout>();
auto& right_vertical_container = horizontal_container.add<Widget>();
right_vertical_container.set_layout<VerticalBoxLayout>();
enum RGBComponent {
Red,
@ -65,34 +65,34 @@ void ColorPicker::build()
Blue
};
m_preview_widget = right_vertical_container->add<Frame>();
m_preview_widget = right_vertical_container.add<Frame>();
auto pal = m_preview_widget->palette();
pal.set_color(ColorRole::Background, m_color);
m_preview_widget->set_fill_with_background_color(true);
m_preview_widget->set_palette(pal);
right_vertical_container->layout()->add_spacer();
auto cancel_button = right_vertical_container->add<Button>("Cancel");
cancel_button->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
cancel_button->set_preferred_size(0, 20);
cancel_button->on_click = [&] {
right_vertical_container.layout()->add_spacer();
auto& cancel_button = right_vertical_container.add<Button>("Cancel");
cancel_button.set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
cancel_button.set_preferred_size(0, 20);
cancel_button.on_click = [&] {
done(Dialog::ExecCancel);
};
auto ok_button = right_vertical_container->add<Button>("Okay");
ok_button->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
ok_button->set_preferred_size(0, 20);
ok_button->on_click = [&] {
auto& ok_button = right_vertical_container.add<Button>("Okay");
ok_button.set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
ok_button.set_preferred_size(0, 20);
ok_button.on_click = [&] {
done(Dialog::ExecOK);
};
auto make_spinbox = [&](RGBComponent component, int initial_value) {
auto spinbox = left_vertical_container->add<SpinBox>();
spinbox->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
spinbox->set_preferred_size(0, 20);
spinbox->set_min(0);
spinbox->set_max(255);
spinbox->set_value(initial_value);
auto& spinbox = left_vertical_container.add<SpinBox>();
spinbox.set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
spinbox.set_preferred_size(0, 20);
spinbox.set_min(0);
spinbox.set_max(255);
spinbox.set_value(initial_value);
spinbox->on_change = [this, component](auto value) {
spinbox.on_change = [this, component](auto value) {
if (component == Red)
m_color.set_red(value);
if (component == Green)
@ -105,7 +105,6 @@ void ColorPicker::build()
m_preview_widget->set_palette(pal);
m_preview_widget->update();
};
return spinbox;
};
make_spinbox(Red, m_color.red());