RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:47:45 +00:00
Code Issues Activity Actions

PixelPaint: Add Merge Active Layer Down action

Browse source 
This allows you to merge the active layer with the one below it.
This commit is contained in:
Mustafa Quraish 2021-09-02 03:10:59 -04:00 • committed by Andreas Kling
parent 97cc34c034
commit 339f0d5bca
3 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Applications/PixelPaint/Image.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -483,6 +484,23 @@ void Image::merge_visible_layers()
} }
} }
void Image::merge_active_layer_down(Layer& layer)
{
if (m_layers.size() < 2)
return;
int layer_index = this->index_of(layer);
if (layer_index == 0) {
dbgln("Cannot merge layer down: layer is already at the bottom");
return; // FIXME: Notify user of error properly.
}
auto& layer_below = m_layers.at(layer_index - 1);
GUI::Painter painter(layer_below.bitmap());
painter.draw_scaled_bitmap(rect(), layer.bitmap(), layer.rect(), (float)layer.opacity_percent() / 100.0f);
remove_layer(layer);
select_layer(&layer_below);
}
void Image::select_layer(Layer* layer) void Image::select_layer(Layer* layer)
{ {
for (auto* client : m_clients) for (auto* client : m_clients)

2
Userland/Applications/PixelPaint/Image.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -74,6 +75,7 @@ public:
void select_layer(Layer*); void select_layer(Layer*);
void flatten_all_layers(); void flatten_all_layers();
void merge_visible_layers(); void merge_visible_layers();
void merge_active_layer_down(Layer& layer);
void add_client(ImageClient&); void add_client(ImageClient&);
void remove_client(ImageClient&); void remove_client(ImageClient&);

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

@ -541,6 +541,19 @@ int main(int argc, char** argv)
}, },
window)); window));
layer_menu.add_action(GUI::Action::create(
"M&erge Active Layer Down", { Mod_Ctrl, Key_E }, [&](auto&) {
auto* editor = current_image_editor();
if (!editor)
return;
auto active_layer = editor->active_layer();
if (!active_layer)
return;
editor->image().merge_active_layer_down(*active_layer);
editor->did_complete_action();
},
window));
auto& filter_menu = window->add_menu("&Filter"); auto& filter_menu = window->add_menu("&Filter");
auto& spatial_filters_menu = filter_menu.add_submenu("&Spatial"); auto& spatial_filters_menu = filter_menu.add_submenu("&Spatial");