mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:27:35 +00:00
PixelPaint: Propagate errors from making tool property widgets
This commit is contained in:
parent
b409a40377
commit
be717edd33
41 changed files with 499 additions and 468 deletions
|
@ -137,48 +137,49 @@ void BrushTool::draw_line(Gfx::Bitmap& bitmap, Gfx::Color color, Gfx::IntPoint s
|
|||
}
|
||||
}
|
||||
|
||||
GUI::Widget* BrushTool::get_properties_widget()
|
||||
ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
|
||||
{
|
||||
if (!m_properties_widget) {
|
||||
m_properties_widget = GUI::Widget::construct();
|
||||
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
|
||||
auto properties_widget = TRY(GUI::Widget::try_create());
|
||||
(void)TRY(properties_widget->try_set_layout<GUI::VerticalBoxLayout>());
|
||||
|
||||
auto& size_container = m_properties_widget->add<GUI::Widget>();
|
||||
size_container.set_fixed_height(20);
|
||||
size_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
|
||||
size_container->set_fixed_height(20);
|
||||
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto& size_label = size_container.add<GUI::Label>("Size:");
|
||||
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label.set_fixed_size(80, 20);
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"));
|
||||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, String::from_utf8_short_string("px"sv));
|
||||
size_slider.set_range(1, 100);
|
||||
size_slider.set_value(m_size);
|
||||
size_slider.set_override_cursor(cursor());
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, String::from_utf8_short_string("px"sv)));
|
||||
size_slider->set_range(1, 100);
|
||||
size_slider->set_value(m_size);
|
||||
size_slider->set_override_cursor(cursor());
|
||||
|
||||
size_slider.on_change = [&](int value) {
|
||||
size_slider->on_change = [this, size_slider](int value) {
|
||||
set_size(value);
|
||||
// Update cursor to provide an instant preview for the selected size.
|
||||
size_slider.set_override_cursor(cursor());
|
||||
size_slider->set_override_cursor(cursor());
|
||||
};
|
||||
set_primary_slider(&size_slider);
|
||||
set_primary_slider(size_slider);
|
||||
|
||||
auto& hardness_container = m_properties_widget->add<GUI::Widget>();
|
||||
hardness_container.set_fixed_height(20);
|
||||
hardness_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>());
|
||||
hardness_container->set_fixed_height(20);
|
||||
(void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:");
|
||||
hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label.set_fixed_size(80, 20);
|
||||
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"));
|
||||
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, String::from_utf8_short_string("%"sv));
|
||||
hardness_slider.set_range(1, 100);
|
||||
hardness_slider.set_value(m_hardness);
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, String::from_utf8_short_string("%"sv)));
|
||||
hardness_slider->set_range(1, 100);
|
||||
hardness_slider->set_value(m_hardness);
|
||||
|
||||
hardness_slider.on_change = [&](int value) {
|
||||
hardness_slider->on_change = [this](int value) {
|
||||
set_hardness(value);
|
||||
};
|
||||
set_secondary_slider(&hardness_slider);
|
||||
set_secondary_slider(hardness_slider);
|
||||
m_properties_widget = properties_widget;
|
||||
}
|
||||
|
||||
return m_properties_widget.ptr();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue