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

PixelPaint: Make ImageEditor::image() return a reference (Image&)

Browse source 
In the new tabbed world, every ImageEditor always has an associated
Image, so this simplifies a bunch of things. :^)
This commit is contained in:
Andreas Kling 2021-06-15 21:35:04 +02:00
parent c6dd3377ee
commit 35456f035c
4 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/PixelPaint/ImageEditor.cpp
View file

@ -377,13 +377,9 @@ void ImageEditor::reset_scale_and_position()
void ImageEditor::relayout()
{
if (!image())
return;
auto& image = *this->image();
Gfx::IntSize new_size;
new_size.set_width(image.size().width() * m_scale);
new_size.set_height(image.size().height() * m_scale);
new_size.set_width(image().size().width() * m_scale);
new_size.set_height(image().size().height() * m_scale);
m_editor_image_rect.set_size(new_size);
Gfx::IntPoint new_location;

4
Userland/Applications/PixelPaint/ImageEditor.h
View file

@ -25,8 +25,8 @@ class ImageEditor final
public:
virtual ~ImageEditor() override;
Image const* image() const { return m_image; }
Image* image() { return m_image; }
Image const& image() const { return m_image; }
Image& image() { return m_image; }
Layer* active_layer() { return m_active_layer; }
void set_active_layer(Layer*);

6
Userland/Applications/PixelPaint/MoveTool.cpp
View file

@ -91,20 +91,20 @@ void MoveTool::on_context_menu(Layer& layer, GUI::ContextMenuEvent& event)
m_context_menu = GUI::Menu::construct();
m_context_menu->add_action(GUI::CommonActions::make_move_to_front_action(
[this](auto&) {
m_editor->image()->move_layer_to_front(*m_context_menu_layer);
m_editor->image().move_layer_to_front(*m_context_menu_layer);
m_editor->layers_did_change();
},
m_editor));
m_context_menu->add_action(GUI::CommonActions::make_move_to_back_action(
[this](auto&) {
m_editor->image()->move_layer_to_back(*m_context_menu_layer);
m_editor->image().move_layer_to_back(*m_context_menu_layer);
m_editor->layers_did_change();
},
m_editor));
m_context_menu->add_separator();
m_context_menu->add_action(GUI::Action::create(
"&Delete Layer", Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"), [this](auto&) {
m_editor->image()->remove_layer(*m_context_menu_layer);
m_editor->image().remove_layer(*m_context_menu_layer);
// FIXME: This should not be done imperatively here. Perhaps a Image::Client interface that ImageEditor can implement?
if (m_editor->active_layer() == m_context_menu_layer)
m_editor->set_active_layer(nullptr);

32
Userland/Applications/PixelPaint/main.cpp
View file

@ -127,12 +127,10 @@ int main(int argc, char** argv)
auto* editor = current_image_editor();
if (!editor)
return;
if (!editor->image())
return;
auto save_path = GUI::FilePicker::get_save_filepath(window, "untitled", "pp");
if (!save_path.has_value())
return;
auto result = editor->image()->write_to_file(save_path.value());
auto result = editor->image().write_to_file(save_path.value());
if (result.is_error()) {
GUI::MessageBox::show_error(window, String::formatted("Could not save {}: {}", save_path.value(), result.error()));
return;
@ -152,12 +150,10 @@ int main(int argc, char** argv)
auto* editor = current_image_editor();
if (!editor)
return;
if (!editor->image())
return;
auto save_path = GUI::FilePicker::get_save_filepath(window, "untitled", "bmp");
if (!save_path.has_value())
return;
auto result = editor->image()->export_bmp_to_file(save_path.value());
auto result = editor->image().export_bmp_to_file(save_path.value());
if (result.is_error())
GUI::MessageBox::show_error(window, String::formatted("Export to BMP failed: {}", result.error()));
},
@ -166,12 +162,10 @@ int main(int argc, char** argv)
GUI::Action::create(
"As &PNG", [&](auto&) {
auto* editor = current_image_editor();
if (!editor->image())
return;
auto save_path = GUI::FilePicker::get_save_filepath(window, "untitled", "png");
if (!save_path.has_value())
return;
auto result = editor->image()->export_bmp_to_file(save_path.value());
auto result = editor->image().export_bmp_to_file(save_path.value());
if (result.is_error())
GUI::MessageBox::show_error(window, String::formatted("Export to PNG failed: {}", result.error()));
},
@ -188,7 +182,6 @@ int main(int argc, char** argv)
auto* editor = current_image_editor();
if (!editor)
return;
VERIFY(editor->image());
if (!editor->active_layer()) {
dbgln("Cannot copy with no active layer selected");
return;
@ -205,14 +198,13 @@ int main(int argc, char** argv)
auto* editor = current_image_editor();
if (!editor)
return;
VERIFY(editor->image());
auto bitmap = GUI::Clipboard::the().bitmap();
if (!bitmap)
return;
auto layer = PixelPaint::Layer::try_create_with_bitmap(*editor->image(), *bitmap, "Pasted layer");
auto layer = PixelPaint::Layer::try_create_with_bitmap(editor->image(), *bitmap, "Pasted layer");
VERIFY(layer);
editor->image()->add_layer(*layer);
editor->image().add_layer(*layer);
editor->set_active_layer(layer);
editor->selection().clear();
});
@ -310,14 +302,14 @@ int main(int argc, char** argv)
auto* editor = current_image_editor();
if (!editor)
return;
auto dialog = PixelPaint::CreateNewLayerDialog::construct(editor->image()->size(), window);
auto dialog = PixelPaint::CreateNewLayerDialog::construct(editor->image().size(), window);
if (dialog->exec() == GUI::Dialog::ExecOK) {
auto layer = PixelPaint::Layer::try_create_with_size(*editor->image(), dialog->layer_size(), dialog->layer_name());
auto layer = PixelPaint::Layer::try_create_with_size(editor->image(), dialog->layer_size(), dialog->layer_name());
if (!layer) {
GUI::MessageBox::show_error(window, String::formatted("Unable to create layer with size {}", dialog->size().to_string()));
return;
}
editor->image()->add_layer(layer.release_nonnull());
editor->image().add_layer(layer.release_nonnull());
editor->layers_did_change();
}
},
@ -353,7 +345,7 @@ int main(int argc, char** argv)
auto active_layer = editor->active_layer();
if (!active_layer)
return;
editor->image()->move_layer_up(*active_layer);
editor->image().move_layer_up(*active_layer);
},
window));
layer_menu.add_action(GUI::Action::create(
@ -364,7 +356,7 @@ int main(int argc, char** argv)
auto active_layer = editor->active_layer();
if (!active_layer)
return;
editor->image()->move_layer_down(*active_layer);
editor->image().move_layer_down(*active_layer);
},
window));
layer_menu.add_separator();
@ -376,7 +368,7 @@ int main(int argc, char** argv)
auto active_layer = editor->active_layer();
if (!active_layer)
return;
editor->image()->remove_layer(*active_layer);
editor->image().remove_layer(*active_layer);
editor->set_active_layer(nullptr);
},
window));
@ -524,7 +516,7 @@ int main(int argc, char** argv)
tab_widget.on_change = [&](auto& widget) {
auto& image_editor = downcast<PixelPaint::ImageEditor>(widget);
palette_widget.set_image_editor(image_editor);
layer_list_widget.set_image(image_editor.image());
layer_list_widget.set_image(&image_editor.image());
layer_properties_widget.set_layer(nullptr);
// FIXME: This is badly factored. It transfers tools from the previously active editor to the new one.
toolbox.template for_each_tool([&](auto& tool) {