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

Userland: Use non-fallible EventReceiver::add() where possible

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-22 22:28:59 +01:00 • committed by Andreas Kling
parent 707ca984bd
commit b4e134cb52
54 changed files with 934 additions and 934 deletions
Download patch file Download diff file Expand all files Collapse all files

120
Userland/Applications/PixelPaint/Tools/BrushTool.cpp
View file

@ -203,12 +203,12 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(60, 20);
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(60, 20);
static constexpr auto s_mode_names = [] {
Array<StringView, (int)BrushMode::__Count> names;
@ -233,18 +233,18 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
return names;
}();
auto mode_combobox = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combobox->set_only_allow_values_from_model(true);
mode_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto& mode_combobox = mode_container.add<GUI::ComboBox>();
mode_combobox.set_only_allow_values_from_model(true);
mode_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto priority_container = TRY(properties_widget->try_add<GUI::Widget>());
priority_container->set_fixed_height(20);
priority_container->set_visible(false);
priority_container->set_layout<GUI::HorizontalBoxLayout>();
auto priority_label = TRY(priority_container->try_add<GUI::Label>("Priority:"_string));
priority_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
priority_label->set_fixed_size(60, 20);
auto& priority_container = properties_widget->add<GUI::Widget>();
priority_container.set_fixed_height(20);
priority_container.set_visible(false);
priority_container.set_layout<GUI::HorizontalBoxLayout>();
auto& priority_label = priority_container.add<GUI::Label>("Priority:"_string);
priority_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
priority_label.set_fixed_size(60, 20);
static constexpr auto s_priority_names = [] {
Array<StringView, (int)PriorityMode::__Count> names;
@ -266,37 +266,37 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
return names;
}();
auto priority_combobox = TRY(priority_container->try_add<GUI::ComboBox>());
priority_combobox->set_only_allow_values_from_model(true);
priority_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_priority_names)>::create(s_priority_names));
priority_combobox->set_selected_index((int)m_priority, GUI::AllowCallback::No);
auto& priority_combobox = priority_container.add<GUI::ComboBox>();
priority_combobox.set_only_allow_values_from_model(true);
priority_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_priority_names)>::create(s_priority_names));
priority_combobox.set_selected_index((int)m_priority, GUI::AllowCallback::No);
auto exposure_container = TRY(properties_widget->try_add<GUI::Widget>());
exposure_container->set_fixed_height(20);
exposure_container->set_visible(false);
exposure_container->set_layout<GUI::HorizontalBoxLayout>();
auto& exposure_container = properties_widget->add<GUI::Widget>();
exposure_container.set_fixed_height(20);
exposure_container.set_visible(false);
exposure_container.set_layout<GUI::HorizontalBoxLayout>();
auto exposure_label = TRY(exposure_container->try_add<GUI::Label>("Exposure:"_string));
exposure_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
exposure_label->set_fixed_size(60, 20);
auto& exposure_label = exposure_container.add<GUI::Label>("Exposure:"_string);
exposure_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
exposure_label.set_fixed_size(60, 20);
auto exposure_slider = TRY(exposure_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
exposure_slider->set_range(1, 100);
exposure_slider->set_value(m_exposure * 100);
auto& exposure_slider = exposure_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
exposure_slider.set_range(1, 100);
exposure_slider.set_value(m_exposure * 100);
mode_combobox->on_change = [this, priority_container, exposure_container](auto&, auto& model_index) {
mode_combobox.on_change = [this, &priority_container, &exposure_container](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)BrushMode::__Count);
m_mode = (BrushMode)model_index.row();
priority_container->set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
exposure_container->set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
priority_container.set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
exposure_container.set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
if (m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn)
update_precomputed_color_values();
};
priority_combobox->on_change = [this](auto&, auto& model_index) {
priority_combobox.on_change = [this](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)PriorityMode::__Count);
@ -304,47 +304,47 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
update_precomputed_color_values();
};
exposure_slider->on_change = [this](int value) {
exposure_slider.on_change = [this](int value) {
m_exposure = value / 100.0f;
update_precomputed_color_values();
};
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
size_container->set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>();
auto& size_container = properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(60, 20);
auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(60, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
size_slider->set_range(1, 250);
size_slider->set_value(m_size);
size_slider->set_override_cursor(cursor());
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider.set_range(1, 250);
size_slider.set_value(m_size);
size_slider.set_override_cursor(cursor());
size_slider->on_change = [this, size_slider](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 = TRY(properties_widget->try_add<GUI::Widget>());
hardness_container->set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>();
auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container.set_fixed_height(20);
hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(60, 20);
auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label.set_fixed_size(60, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
hardness_slider->set_range(1, 100);
hardness_slider->set_value(m_hardness);
auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider.set_range(1, 100);
hardness_slider.set_value(m_hardness);
hardness_slider->on_change = [this](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;
}

22
Userland/Applications/PixelPaint/Tools/BucketTool.cpp
View file

@ -67,22 +67,22 @@ ErrorOr<GUI::Widget*> BucketTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto threshold_container = TRY(properties_widget->try_add<GUI::Widget>());
threshold_container->set_fixed_height(20);
threshold_container->set_layout<GUI::HorizontalBoxLayout>();
auto& threshold_container = properties_widget->add<GUI::Widget>();
threshold_container.set_fixed_height(20);
threshold_container.set_layout<GUI::HorizontalBoxLayout>();
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string));
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20);
auto& threshold_label = threshold_container.add<GUI::Label>("Threshold:"_string);
threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label.set_fixed_size(80, 20);
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
threshold_slider->set_range(0, 100);
threshold_slider->set_value(m_threshold);
auto& threshold_slider = threshold_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
threshold_slider.set_range(0, 100);
threshold_slider.set_value(m_threshold);
threshold_slider->on_change = [this](int value) {
threshold_slider.on_change = [this](int value) {
m_threshold = value;
};
set_primary_slider(threshold_slider);
set_primary_slider(&threshold_slider);
m_properties_widget = properties_widget;
}

44
Userland/Applications/PixelPaint/Tools/CloneTool.cpp
View file

@ -131,40 +131,40 @@ ErrorOr<GUI::Widget*> CloneTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
size_container->set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>();
auto& size_container = properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20);
auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
size_slider->set_range(1, 100);
size_slider->set_value(size());
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider.set_range(1, 100);
size_slider.set_value(size());
size_slider->on_change = [this](int value) {
size_slider.on_change = [this](int value) {
auto old_sample_marker_rect = sample_marker_rect();
set_size(value);
update_sample_marker(old_sample_marker_rect);
};
set_primary_slider(size_slider);
set_primary_slider(&size_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>());
hardness_container->set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>();
auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container.set_fixed_height(20);
hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20);
auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
hardness_slider->set_range(1, 100);
hardness_slider->on_change = [&](int value) {
auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider.set_range(1, 100);
hardness_slider.on_change = [&](int value) {
set_hardness(value);
};
hardness_slider->set_value(100);
set_secondary_slider(hardness_slider);
hardness_slider.set_value(100);
set_secondary_slider(&hardness_slider);
m_properties_widget = properties_widget;
}

74
Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
View file

@ -132,59 +132,59 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_container = TRY(properties_widget->try_add<GUI::Widget>());
thickness_container->set_fixed_height(20);
thickness_container->set_layout<GUI::HorizontalBoxLayout>();
auto& thickness_container = properties_widget->add<GUI::Widget>();
thickness_container.set_fixed_height(20);
thickness_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string));
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20);
auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:"_string);
thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label.set_fixed_size(80, 20);
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
thickness_slider->set_range(1, 10);
thickness_slider->set_value(m_thickness);
auto& thickness_slider = thickness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_slider.set_range(1, 10);
thickness_slider.set_value(m_thickness);
thickness_slider->on_change = [this](int value) {
thickness_slider.on_change = [this](int value) {
m_thickness = value;
};
set_primary_slider(thickness_slider);
set_primary_slider(&thickness_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(70);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(70);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
mode_radio_container->set_layout<GUI::VerticalBoxLayout>();
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string));
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string));
auto aa_enable_checkbox = TRY(mode_radio_container->try_add<GUI::CheckBox>("Anti-alias"_string));
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline"_string);
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill"_string);
auto& aa_enable_checkbox = mode_radio_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox->on_checked = [this](bool checked) {
aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked;
};
outline_mode_radio->on_checked = [this](bool checked) {
outline_mode_radio.on_checked = [this](bool checked) {
if (checked)
m_fill_mode = FillMode::Outline;
};
fill_mode_radio->on_checked = [this](bool checked) {
fill_mode_radio.on_checked = [this](bool checked) {
if (checked)
m_fill_mode = FillMode::Fill;
};
aa_enable_checkbox->set_checked(true);
outline_mode_radio->set_checked(true);
aa_enable_checkbox.set_checked(true);
outline_mode_radio.set_checked(true);
auto aspect_container = TRY(properties_widget->try_add<GUI::Widget>());
aspect_container->set_fixed_height(20);
aspect_container->set_layout<GUI::HorizontalBoxLayout>();
auto& aspect_container = properties_widget->add<GUI::Widget>();
aspect_container.set_fixed_height(20);
aspect_container.set_layout<GUI::HorizontalBoxLayout>();
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string));
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(80, 20);
auto& aspect_label = aspect_container.add<GUI::Label>("Aspect Ratio:"_string);
aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label.set_fixed_size(80, 20);
m_aspect_w_textbox = TRY(aspect_container->try_add<GUI::TextBox>());
m_aspect_w_textbox = aspect_container.add<GUI::TextBox>();
m_aspect_w_textbox->set_fixed_height(20);
m_aspect_w_textbox->set_fixed_width(25);
m_aspect_w_textbox->on_change = [this] {
@ -197,11 +197,11 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
}
};
auto multiply_label = TRY(aspect_container->try_add<GUI::Label>("x"_string));
multiply_label->set_text_alignment(Gfx::TextAlignment::Center);
multiply_label->set_fixed_size(10, 20);
auto& multiply_label = aspect_container.add<GUI::Label>("x"_string);
multiply_label.set_text_alignment(Gfx::TextAlignment::Center);
multiply_label.set_fixed_size(10, 20);
m_aspect_h_textbox = TRY(aspect_container->try_add<GUI::TextBox>());
m_aspect_h_textbox = aspect_container.add<GUI::TextBox>();
m_aspect_h_textbox->set_fixed_height(20);
m_aspect_h_textbox->set_fixed_width(25);
m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); };

94
Userland/Applications/PixelPaint/Tools/EraseTool.cpp
View file

@ -60,78 +60,78 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
size_container->set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>();
auto& size_container = properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20);
auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
size_slider->set_range(1, 250);
size_slider->set_value(size());
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider.set_range(1, 250);
size_slider.set_value(size());
size_slider->on_change = [this, size_slider](int value) {
size_slider.on_change = [this, &size_slider](int value) {
set_size(value);
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 = TRY(properties_widget->try_add<GUI::Widget>());
hardness_container->set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>();
auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container.set_fixed_height(20);
hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20);
auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
hardness_slider->set_range(1, 100);
hardness_slider->set_value(hardness());
auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider.set_range(1, 100);
hardness_slider.set_value(hardness());
hardness_slider->on_change = [this](int value) {
hardness_slider.on_change = [this](int value) {
set_hardness(value);
};
set_secondary_slider(hardness_slider);
set_secondary_slider(&hardness_slider);
auto secondary_color_container = TRY(properties_widget->try_add<GUI::Widget>());
secondary_color_container->set_fixed_height(20);
secondary_color_container->set_layout<GUI::HorizontalBoxLayout>();
auto& secondary_color_container = properties_widget->add<GUI::Widget>();
secondary_color_container.set_fixed_height(20);
secondary_color_container.set_layout<GUI::HorizontalBoxLayout>();
auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add<GUI::CheckBox>());
use_secondary_color_checkbox->set_checked(m_use_secondary_color);
use_secondary_color_checkbox->set_text("Use secondary color"_string);
use_secondary_color_checkbox->on_checked = [this](bool checked) {
auto& use_secondary_color_checkbox = secondary_color_container.add<GUI::CheckBox>();
use_secondary_color_checkbox.set_checked(m_use_secondary_color);
use_secondary_color_checkbox.set_text("Use secondary color"_string);
use_secondary_color_checkbox.on_checked = [this](bool checked) {
m_use_secondary_color = checked;
};
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(46);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Draw Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(46);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Draw Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
mode_radio_container->set_layout<GUI::VerticalBoxLayout>();
auto pencil_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Pencil"_string));
auto brush_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Brush"_string));
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& pencil_mode_radio = mode_radio_container.add<GUI::RadioButton>("Pencil"_string);
auto& brush_mode_radio = mode_radio_container.add<GUI::RadioButton>("Brush"_string);
pencil_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) {
pencil_mode_radio.on_checked = [this, &hardness_slider, &size_slider](bool) {
m_draw_mode = DrawMode::Pencil;
hardness_slider->set_enabled(false);
hardness_slider.set_enabled(false);
refresh_editor_cursor();
size_slider->set_override_cursor(cursor());
size_slider.set_override_cursor(cursor());
};
brush_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) {
brush_mode_radio.on_checked = [this, &hardness_slider, &size_slider](bool) {
m_draw_mode = DrawMode::Brush;
hardness_slider->set_enabled(true);
hardness_slider.set_enabled(true);
refresh_editor_cursor();
size_slider->set_override_cursor(cursor());
size_slider.set_override_cursor(cursor());
};
pencil_mode_radio->set_checked(true);
pencil_mode_radio.set_checked(true);
m_properties_widget = properties_widget;
}

86
Userland/Applications/PixelPaint/Tools/GradientTool.cpp
View file

@ -204,12 +204,12 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Gradient Type:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Gradient Type:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
static constexpr auto s_mode_names = [] {
Array<StringView, (int)GradientMode::__Count> names;
@ -228,36 +228,36 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
return names;
}();
auto mode_combobox = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combobox->set_only_allow_values_from_model(true);
mode_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto& mode_combobox = mode_container.add<GUI::ComboBox>();
mode_combobox.set_only_allow_values_from_model(true);
mode_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto opacity_container = TRY(properties_widget->try_add<GUI::Widget>());
opacity_container->set_fixed_height(20);
opacity_container->set_layout<GUI::HorizontalBoxLayout>();
auto& opacity_container = properties_widget->add<GUI::Widget>();
opacity_container.set_fixed_height(20);
opacity_container.set_layout<GUI::HorizontalBoxLayout>();
auto opacity_label = TRY(opacity_container->try_add<GUI::Label>("Opacity:"_string));
opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
opacity_label->set_fixed_size(80, 20);
auto& opacity_label = opacity_container.add<GUI::Label>("Opacity:"_string);
opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
opacity_label.set_fixed_size(80, 20);
auto opacity_slider = TRY(opacity_container->try_add<GUI::HorizontalOpacitySlider>());
opacity_slider->set_range(1, 100);
opacity_slider->set_value(100);
auto& opacity_slider = opacity_container.add<GUI::HorizontalOpacitySlider>();
opacity_slider.set_range(1, 100);
opacity_slider.set_value(100);
opacity_slider->on_change = [this](int value) {
opacity_slider.on_change = [this](int value) {
m_opacity = value;
m_editor->update();
};
set_primary_slider(opacity_slider);
set_primary_slider(&opacity_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>());
hardness_container->set_layout<GUI::HorizontalBoxLayout>();
hardness_container->set_fixed_height(20);
hardness_container->set_visible(m_mode == GradientMode::Radial);
auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container.set_layout<GUI::HorizontalBoxLayout>();
hardness_container.set_fixed_height(20);
hardness_container.set_visible(m_mode == GradientMode::Radial);
mode_combobox->on_change = [this, hardness_container](auto&, auto& model_index) {
mode_combobox.on_change = [this, &hardness_container](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)GradientMode::__Count);
@ -268,37 +268,37 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
reset();
}
hardness_container->set_visible(m_mode == GradientMode::Radial);
hardness_container.set_visible(m_mode == GradientMode::Radial);
};
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20);
auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
hardness_slider->set_range(1, 99);
hardness_slider->set_value(m_hardness);
hardness_slider->on_change = [this](int value) {
auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider.set_range(1, 99);
hardness_slider.set_value(m_hardness);
hardness_slider.on_change = [this](int value) {
if (m_mode == GradientMode::Radial && m_editor) {
m_hardness = value;
m_editor->update();
}
};
set_secondary_slider(hardness_slider);
set_secondary_slider(&hardness_slider);
auto use_secondary_color_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Use secondary color"_string));
use_secondary_color_checkbox->on_checked = [this](bool checked) {
auto& use_secondary_color_checkbox = properties_widget->add<GUI::CheckBox>("Use secondary color"_string);
use_secondary_color_checkbox.on_checked = [this](bool checked) {
m_use_secondary_color = checked;
m_editor->update();
};
auto button_container = TRY(properties_widget->try_add<GUI::Widget>());
button_container->set_fixed_height(22);
button_container->set_layout<GUI::HorizontalBoxLayout>();
button_container->add_spacer();
auto& button_container = properties_widget->add<GUI::Widget>();
button_container.set_fixed_height(22);
button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container.add_spacer();
auto apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"_string));
apply_button->on_click = [this](auto) {
auto& apply_button = button_container.add<GUI::DialogButton>("Apply"_string);
apply_button.on_click = [this](auto) {
rasterize_gradient();
};
m_properties_widget = properties_widget;

24
Userland/Applications/PixelPaint/Tools/GuideTool.cpp
View file

@ -182,23 +182,23 @@ ErrorOr<GUI::Widget*> GuideTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto snapping_container = TRY(properties_widget->try_add<GUI::Widget>());
snapping_container->set_fixed_height(20);
snapping_container->set_layout<GUI::HorizontalBoxLayout>();
auto& snapping_container = properties_widget->add<GUI::Widget>();
snapping_container.set_fixed_height(20);
snapping_container.set_layout<GUI::HorizontalBoxLayout>();
auto snapping_label = TRY(snapping_container->try_add<GUI::Label>("Snap offset:"_string));
snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
snapping_label->set_fixed_size(80, 20);
snapping_label->set_tooltip_deprecated("Press Shift to snap");
auto& snapping_label = snapping_container.add<GUI::Label>("Snap offset:"_string);
snapping_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
snapping_label.set_fixed_size(80, 20);
snapping_label.set_tooltip_deprecated("Press Shift to snap");
auto snapping_slider = TRY(snapping_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
snapping_slider->set_range(0, 50);
snapping_slider->set_value(m_snap_size);
auto& snapping_slider = snapping_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
snapping_slider.set_range(0, 50);
snapping_slider.set_value(m_snap_size);
snapping_slider->on_change = [this](int value) {
snapping_slider.on_change = [this](int value) {
m_snap_size = value;
};
set_primary_slider(snapping_slider);
set_primary_slider(&snapping_slider);
m_properties_widget = properties_widget;
}

24
Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp
View file

@ -163,14 +163,14 @@ ErrorOr<GUI::Widget*> LassoSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
mode_label->set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_label = mode_container.add<GUI::Label>();
mode_label.set_text("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
static constexpr auto s_merge_mode_names = [] {
Array<StringView, (int)Selection::MergeMode::__Count> names;
@ -195,11 +195,11 @@ ErrorOr<GUI::Widget*> LassoSelectTool::get_properties_widget()
return names;
}();
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combo->set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) {
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count);

40
Userland/Applications/PixelPaint/Tools/LineTool.cpp
View file

@ -125,36 +125,36 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_container = TRY(properties_widget->try_add<GUI::Widget>());
thickness_container->set_fixed_height(20);
thickness_container->set_layout<GUI::HorizontalBoxLayout>();
auto& thickness_container = properties_widget->add<GUI::Widget>();
thickness_container.set_fixed_height(20);
thickness_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string));
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20);
auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:"_string);
thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label.set_fixed_size(80, 20);
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
thickness_slider->set_range(1, 10);
thickness_slider->set_value(m_thickness);
auto& thickness_slider = thickness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_slider.set_range(1, 10);
thickness_slider.set_value(m_thickness);
thickness_slider->on_change = [this](int value) {
thickness_slider.on_change = [this](int value) {
m_thickness = value;
};
set_primary_slider(thickness_slider);
set_primary_slider(&thickness_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
auto aa_enable_checkbox = TRY(mode_container->try_add<GUI::CheckBox>("Anti-alias"_string));
aa_enable_checkbox->on_checked = [this](bool checked) {
auto& aa_enable_checkbox = mode_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked;
};
aa_enable_checkbox->set_checked(true);
aa_enable_checkbox.set_checked(true);
m_properties_widget = properties_widget;
}

20
Userland/Applications/PixelPaint/Tools/MoveTool.cpp
View file

@ -295,18 +295,18 @@ ErrorOr<GUI::Widget*> MoveTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto selection_mode_container = TRY(properties_widget->try_add<GUI::Widget>());
selection_mode_container->set_layout<GUI::HorizontalBoxLayout>();
selection_mode_container->set_fixed_height(46);
auto selection_mode_label = TRY(selection_mode_container->try_add<GUI::Label>("Selection Mode:"_string));
selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
selection_mode_label->set_fixed_size(80, 40);
auto& selection_mode_container = properties_widget->add<GUI::Widget>();
selection_mode_container.set_layout<GUI::HorizontalBoxLayout>();
selection_mode_container.set_fixed_height(46);
auto& selection_mode_label = selection_mode_container.add<GUI::Label>("Selection Mode:"_string);
selection_mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
selection_mode_label.set_fixed_size(80, 40);
auto mode_radio_container = TRY(selection_mode_container->try_add<GUI::Widget>());
mode_radio_container->set_layout<GUI::VerticalBoxLayout>();
m_selection_mode_foreground = TRY(mode_radio_container->try_add<GUI::RadioButton>("Foreground"_string));
auto& mode_radio_container = selection_mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
m_selection_mode_foreground = mode_radio_container.add<GUI::RadioButton>("Foreground"_string);
m_selection_mode_active = TRY(mode_radio_container->try_add<GUI::RadioButton>("Active Layer"_string));
m_selection_mode_active = mode_radio_container.add<GUI::RadioButton>("Active Layer"_string);
m_selection_mode_foreground->on_checked = [this](bool) {
m_layer_selection_mode = LayerSelectionMode::ForegroundLayer;

22
Userland/Applications/PixelPaint/Tools/PenTool.cpp
View file

@ -41,22 +41,22 @@ ErrorOr<GUI::Widget*> PenTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
size_container->set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>();
auto& size_container = properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Thickness:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20);
auto& size_label = size_container.add<GUI::Label>("Thickness:"_string);
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
size_slider->set_range(1, 20);
size_slider->set_value(size());
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider.set_range(1, 20);
size_slider.set_value(size());
size_slider->on_change = [this](int value) {
size_slider.on_change = [this](int value) {
set_size(value);
};
set_primary_slider(size_slider);
set_primary_slider(&size_slider);
m_properties_widget = properties_widget;
}

6
Userland/Applications/PixelPaint/Tools/PickerTool.cpp
View file

@ -47,9 +47,9 @@ ErrorOr<GUI::Widget*> PickerTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto sample_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Sample all layers"_string));
sample_checkbox->set_checked(m_sample_all_layers);
sample_checkbox->on_checked = [this](bool value) {
auto& sample_checkbox = properties_widget->add<GUI::CheckBox>("Sample all layers"_string);
sample_checkbox.set_checked(m_sample_all_layers);
sample_checkbox.on_checked = [this](bool value) {
m_sample_all_layers = value;
};
m_properties_widget = properties_widget;

24
Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp
View file

@ -192,14 +192,14 @@ ErrorOr<GUI::Widget*> PolygonalSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
mode_label->set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_label = mode_container.add<GUI::Label>();
mode_label.set_text("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
static constexpr auto s_merge_mode_names = [] {
Array<StringView, (int)Selection::MergeMode::__Count> names;
@ -224,11 +224,11 @@ ErrorOr<GUI::Widget*> PolygonalSelectTool::get_properties_widget()
return names;
}();
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combo->set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) {
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count);

48
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
View file

@ -160,33 +160,33 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto feather_container = TRY(properties_widget->try_add<GUI::Widget>());
feather_container->set_fixed_height(20);
feather_container->set_layout<GUI::HorizontalBoxLayout>();
auto& feather_container = properties_widget->add<GUI::Widget>();
feather_container.set_fixed_height(20);
feather_container.set_layout<GUI::HorizontalBoxLayout>();
auto feather_label = TRY(feather_container->try_add<GUI::Label>());
feather_label->set_text("Feather:"_string);
feather_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
feather_label->set_fixed_size(80, 20);
auto& feather_label = feather_container.add<GUI::Label>();
feather_label.set_text("Feather:"_string);
feather_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
feather_label.set_fixed_size(80, 20);
int const feather_slider_max = 100;
auto feather_slider = TRY(feather_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
feather_slider->set_range(0, feather_slider_max);
feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max));
auto& feather_slider = feather_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
feather_slider.set_range(0, feather_slider_max);
feather_slider.set_value((int)floorf(m_edge_feathering * (float)feather_slider_max));
feather_slider->on_change = [this](int value) {
feather_slider.on_change = [this](int value) {
m_edge_feathering = (float)value / (float)feather_slider_max;
};
set_primary_slider(feather_slider);
set_primary_slider(&feather_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
mode_label->set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_label = mode_container.add<GUI::Label>();
mode_label.set_text("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) {
switch ((Selection::MergeMode)i) {
@ -207,11 +207,11 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
}
}
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combo->set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) {
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count);

100
Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
View file

@ -146,28 +146,28 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_or_radius_container = TRY(properties_widget->try_add<GUI::Widget>());
thickness_or_radius_container->set_fixed_height(20);
thickness_or_radius_container->set_layout<GUI::HorizontalBoxLayout>();
auto& thickness_or_radius_container = properties_widget->add<GUI::Widget>();
thickness_or_radius_container.set_fixed_height(20);
thickness_or_radius_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_or_radius_label = TRY(thickness_or_radius_container->try_add<GUI::Label>());
thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_or_radius_label->set_fixed_size(80, 20);
auto& thickness_or_radius_label = thickness_or_radius_container.add<GUI::Label>();
thickness_or_radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_or_radius_label.set_fixed_size(80, 20);
auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
auto& thickness_or_radius_slider = thickness_or_radius_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_or_radius_slider->on_change = [&](int value) {
thickness_or_radius_slider.on_change = [&](int value) {
if (m_fill_mode == FillMode::RoundedCorners) {
m_corner_radius = value;
} else
m_thickness = value;
};
auto update_slider = [this, thickness_or_radius_label, thickness_or_radius_slider] {
auto update_slider = [this, &thickness_or_radius_label, &thickness_or_radius_slider] {
auto update_values = [&](auto label, int value, int range_min, int range_max = 10) {
thickness_or_radius_label->set_text(String::from_utf8(label).release_value_but_fixme_should_propagate_errors());
thickness_or_radius_slider->set_range(range_min, range_max);
thickness_or_radius_slider->set_value(value);
thickness_or_radius_label.set_text(String::from_utf8(label).release_value_but_fixme_should_propagate_errors());
thickness_or_radius_slider.set_range(range_min, range_max);
thickness_or_radius_slider.set_value(value);
};
if (m_fill_mode == FillMode::RoundedCorners)
update_values("Radius:"sv, m_corner_radius, 0, 50);
@ -176,64 +176,64 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
};
update_slider();
set_primary_slider(thickness_or_radius_slider);
set_primary_slider(&thickness_or_radius_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(90);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(30, 20);
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(90);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(30, 20);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
mode_radio_container->set_layout<GUI::VerticalBoxLayout>();
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string));
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string));
auto gradient_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Gradient"_string));
mode_radio_container->set_fixed_width(70);
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline"_string);
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill"_string);
auto& gradient_mode_radio = mode_radio_container.add<GUI::RadioButton>("Gradient"_string);
mode_radio_container.set_fixed_width(70);
auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Rounded"_string));
auto& rounded_corners_mode_radio = mode_radio_container.add<GUI::RadioButton>("Rounded"_string);
outline_mode_radio->on_checked = [this, update_slider](bool) {
outline_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Outline;
update_slider();
};
fill_mode_radio->on_checked = [this, update_slider](bool) {
fill_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Fill;
update_slider();
};
gradient_mode_radio->on_checked = [this, update_slider](bool) {
gradient_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Gradient;
update_slider();
};
rounded_corners_mode_radio->on_checked = [this, update_slider](bool) {
rounded_corners_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::RoundedCorners;
update_slider();
};
outline_mode_radio->set_checked(true);
outline_mode_radio.set_checked(true);
auto mode_extras_container = TRY(mode_container->try_add<GUI::Widget>());
mode_extras_container->set_layout<GUI::VerticalBoxLayout>();
auto& mode_extras_container = mode_container.add<GUI::Widget>();
mode_extras_container.set_layout<GUI::VerticalBoxLayout>();
auto aa_enable_checkbox = TRY(mode_extras_container->try_add<GUI::CheckBox>("Anti-alias"_string));
aa_enable_checkbox->on_checked = [this](bool checked) {
auto& aa_enable_checkbox = mode_extras_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked;
};
aa_enable_checkbox->set_checked(true);
aa_enable_checkbox.set_checked(true);
auto aspect_container = TRY(mode_extras_container->try_add<GUI::Widget>());
aspect_container->set_layout<GUI::VerticalBoxLayout>();
aspect_container->set_fixed_width(75);
auto& aspect_container = mode_extras_container.add<GUI::Widget>();
aspect_container.set_layout<GUI::VerticalBoxLayout>();
aspect_container.set_fixed_width(75);
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string));
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(75, 20);
auto& aspect_label = aspect_container.add<GUI::Label>("Aspect Ratio:"_string);
aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label.set_fixed_size(75, 20);
auto aspect_fields_container = TRY(aspect_container->try_add<GUI::Widget>());
aspect_fields_container->set_fixed_width(75);
aspect_fields_container->set_layout<GUI::HorizontalBoxLayout>();
auto& aspect_fields_container = aspect_container.add<GUI::Widget>();
aspect_fields_container.set_fixed_width(75);
aspect_fields_container.set_layout<GUI::HorizontalBoxLayout>();
m_aspect_w_textbox = TRY(aspect_fields_container->try_add<GUI::TextBox>());
m_aspect_w_textbox = aspect_fields_container.add<GUI::TextBox>();
m_aspect_w_textbox->set_fixed_height(20);
m_aspect_w_textbox->set_fixed_width(25);
m_aspect_w_textbox->on_change = [this] {
@ -246,11 +246,11 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
}
};
auto multiply_label = TRY(aspect_fields_container->try_add<GUI::Label>("x"_string));
multiply_label->set_text_alignment(Gfx::TextAlignment::Center);
multiply_label->set_fixed_size(10, 20);
auto& multiply_label = aspect_fields_container.add<GUI::Label>("x"_string);
multiply_label.set_text_alignment(Gfx::TextAlignment::Center);
multiply_label.set_fixed_size(10, 20);
m_aspect_h_textbox = TRY(aspect_fields_container->try_add<GUI::TextBox>());
m_aspect_h_textbox = aspect_fields_container.add<GUI::TextBox>();
m_aspect_h_textbox->set_fixed_height(20);
m_aspect_h_textbox->set_fixed_width(25);
m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); };

44
Userland/Applications/PixelPaint/Tools/SprayTool.cpp
View file

@ -96,39 +96,39 @@ ErrorOr<GUI::Widget*> SprayTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>());
size_container->set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>();
auto& size_container = properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20);
auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
size_slider->set_range(1, 20);
size_slider->set_value(m_thickness);
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider.set_range(1, 20);
size_slider.set_value(m_thickness);
size_slider->on_change = [this](int value) {
size_slider.on_change = [this](int value) {
m_thickness = value;
};
set_primary_slider(size_slider);
set_primary_slider(&size_slider);
auto density_container = TRY(properties_widget->try_add<GUI::Widget>());
density_container->set_fixed_height(20);
density_container->set_layout<GUI::HorizontalBoxLayout>();
auto& density_container = properties_widget->add<GUI::Widget>();
density_container.set_fixed_height(20);
density_container.set_layout<GUI::HorizontalBoxLayout>();
auto density_label = TRY(density_container->try_add<GUI::Label>("Density:"_string));
density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
density_label->set_fixed_size(80, 20);
auto& density_label = density_container.add<GUI::Label>("Density:"_string);
density_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
density_label.set_fixed_size(80, 20);
auto density_slider = TRY(density_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
density_slider->set_range(1, 100);
density_slider->set_value(m_density);
auto& density_slider = density_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
density_slider.set_range(1, 100);
density_slider.set_value(m_density);
density_slider->on_change = [this](int value) {
density_slider.on_change = [this](int value) {
m_density = value;
};
set_secondary_slider(density_slider);
set_secondary_slider(&density_slider);
m_properties_widget = properties_widget;
}

10
Userland/Applications/PixelPaint/Tools/TextTool.cpp
View file

@ -111,13 +111,13 @@ ErrorOr<GUI::Widget*> TextTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto font_header = TRY(properties_widget->try_add<GUI::Label>("Current Font:"_string));
font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto& font_header = properties_widget->add<GUI::Label>("Current Font:"_string);
font_header.set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_font_label = TRY(properties_widget->try_add<GUI::Label>(m_selected_font->human_readable_name()));
m_font_label = properties_widget->add<GUI::Label>(m_selected_font->human_readable_name());
auto change_font_button = TRY(properties_widget->try_add<GUI::Button>("Change Font..."_string));
change_font_button->on_click = [this](auto) {
auto& change_font_button = properties_widget->add<GUI::Button>("Change Font..."_string);
change_font_button.on_click = [this](auto) {
auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false);
if (picker->exec() == GUI::Dialog::ExecResult::OK) {
m_font_label->set_text(picker->font()->human_readable_name());

46
Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp
View file

@ -75,31 +75,31 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto threshold_container = TRY(properties_widget->try_add<GUI::Widget>());
threshold_container->set_fixed_height(20);
threshold_container->set_layout<GUI::HorizontalBoxLayout>();
auto& threshold_container = properties_widget->add<GUI::Widget>();
threshold_container.set_fixed_height(20);
threshold_container.set_layout<GUI::HorizontalBoxLayout>();
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string));
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20);
auto& threshold_label = threshold_container.add<GUI::Label>("Threshold:"_string);
threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label.set_fixed_size(80, 20);
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
threshold_slider->set_range(0, 100);
threshold_slider->set_value(m_threshold);
auto& threshold_slider = threshold_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
threshold_slider.set_range(0, 100);
threshold_slider.set_value(m_threshold);
threshold_slider->on_change = [this](int value) {
threshold_slider.on_change = [this](int value) {
m_threshold = value;
};
set_primary_slider(threshold_slider);
set_primary_slider(&threshold_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>();
auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container.set_fixed_height(20);
mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
mode_label->set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20);
auto& mode_label = mode_container.add<GUI::Label>();
mode_label.set_text("Mode:"_string);
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) {
switch ((Selection::MergeMode)i) {
@ -120,11 +120,11 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
}
}
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>());
mode_combo->set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) {
auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo.set_only_allow_values_from_model(true);
mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo.set_selected_index((int)m_merge_mode);
mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count);

22
Userland/Applications/PixelPaint/Tools/ZoomTool.cpp
View file

@ -29,22 +29,22 @@ ErrorOr<GUI::Widget*> ZoomTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto sensitivity_container = TRY(properties_widget->try_add<GUI::Widget>());
sensitivity_container->set_fixed_height(20);
sensitivity_container->set_layout<GUI::HorizontalBoxLayout>();
auto& sensitivity_container = properties_widget->add<GUI::Widget>();
sensitivity_container.set_fixed_height(20);
sensitivity_container.set_layout<GUI::HorizontalBoxLayout>();
auto sensitivity_label = TRY(sensitivity_container->try_add<GUI::Label>("Sensitivity:"_string));
sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
sensitivity_label->set_fixed_size(80, 20);
auto& sensitivity_label = sensitivity_container.add<GUI::Label>("Sensitivity:"_string);
sensitivity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
sensitivity_label.set_fixed_size(80, 20);
auto sensitivity_slider = TRY(sensitivity_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
sensitivity_slider->set_range(1, 100);
sensitivity_slider->set_value(100 * m_sensitivity);
auto& sensitivity_slider = sensitivity_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
sensitivity_slider.set_range(1, 100);
sensitivity_slider.set_value(100 * m_sensitivity);
sensitivity_slider->on_change = [this](int value) {
sensitivity_slider.on_change = [this](int value) {
m_sensitivity = value / 100.0f;
};
set_primary_slider(sensitivity_slider);
set_primary_slider(&sensitivity_slider);
m_properties_widget = properties_widget;
}