beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

PixelPaint: Preserve layer location when copying layers

Browse source 
Location metadata is now included when copying a layer to the
clipboard. This allows a pasted layer to be placed in the location it
was copied from.
This commit is contained in:
Tim Ledbetter 2023-01-16 17:38:36 +00:00 committed by Jelle Raaijmakers
parent 112035d5c3
commit 3fb4d50982
Notes: sideshowbarker 2024-07-17 06:00:02 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/3fb4d50982
Pull-request: https://github.com/SerenityOS/serenity/pull/17046
Reviewed-by: https://github.com/gmta ✅
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -307,7 +307,12 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
dbgln("try_copy_bitmap() from Layer failed"); dbgln("try_copy_bitmap() from Layer failed");
return; return;
} }
GUI::Clipboard::the().set_bitmap(*bitmap); auto layer_rect = editor->active_layer()->relative_rect();
HashMap<DeprecatedString, DeprecatedString> layer_metadata;
layer_metadata.set("pixelpaint-layer-x", DeprecatedString::number(layer_rect.x()));
layer_metadata.set("pixelpaint-layer-y", DeprecatedString::number(layer_rect.y()));
GUI::Clipboard::the().set_bitmap(*bitmap, layer_metadata);
}); });
m_copy_merged_action = GUI::Action::create( m_copy_merged_action = GUI::Action::create(
@ -333,7 +338,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return; return;
} }
auto bitmap = GUI::Clipboard::the().fetch_data_and_type().as_bitmap(); auto data_and_type = GUI::Clipboard::the().fetch_data_and_type();
auto bitmap = data_and_type.as_bitmap();
if (!bitmap) if (!bitmap)
return; return;
@ -343,6 +349,27 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return; return;
} }
auto layer = layer_result.release_value(); auto layer = layer_result.release_value();
auto layer_x_position = data_and_type.metadata.get("pixelpaint-layer-x");
auto layer_y_position = data_and_type.metadata.get("pixelpaint-layer-y");
if (layer_x_position.has_value() && layer_y_position.has_value()) {
auto x = layer_x_position.value().to_int();
auto y = layer_y_position.value().to_int();
if (x.has_value() && x.value()) {
auto pasted_layer_location = Gfx::IntPoint { x.value(), y.value() };
auto pasted_layer_frame_rect = editor->content_to_frame_rect({ pasted_layer_location, layer->size() }).to_type<int>();
// If the pasted layer is entirely outside the canvas bounds, default to the top left.
if (!editor->content_rect().intersects(pasted_layer_frame_rect))
pasted_layer_location = {};
layer->set_location(pasted_layer_location);
// Ensure the pasted layer is visible to the user.
if (!editor->frame_inner_rect().intersects(pasted_layer_frame_rect))
editor->fit_content_to_view();
}
}
editor->image().add_layer(*layer); editor->image().add_layer(*layer);
editor->set_active_layer(layer); editor->set_active_layer(layer);
editor->image().selection().clear(); editor->image().selection().clear();