RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 10:22:45 +00:00
Code Issues Activity Actions

PixelPaint: Let the move tool optionally select the active layer

Browse source 
Previously, the move tool would always select the topmost layer before
performing a move operation. This commit adds an option for the move
tool to always select the active layer, even if it is behind another.
This commit is contained in:
Tim Ledbetter 2023-01-15 21:22:30 +00:00 • committed by Jelle Raaijmakers
parent 16eca649f1
commit 77e15ff4da
3 changed files with 66 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,8 @@
#include "../Layer.h"
#include <AK/String.h>
#include <LibGUI/Action.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
@ -138,6 +140,9 @@ bool MoveTool::on_keydown(GUI::KeyEvent& event)
if (event.key() == Key_Shift)
m_keep_aspect_ratio = true;
if (event.key() == Key_Alt)
toggle_selection_mode();
if (m_scaling)
return true;
@ -176,6 +181,9 @@ void MoveTool::on_keyup(GUI::KeyEvent& event)
{
if (event.key() == Key_Shift)
m_keep_aspect_ratio = false;
if (event.key() == Key_Alt)
toggle_selection_mode();
}
void MoveTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
@ -243,4 +251,44 @@ Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> MoveTool::cursor()
return Gfx::StandardCursor::Move;
}
GUI::Widget* MoveTool::get_properties_widget()
{
if (!m_properties_widget) {
m_properties_widget = GUI::Widget::construct();
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto& selection_mode_container = m_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:");
selection_mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
selection_mode_label.set_fixed_size(80, 40);
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");
m_selection_mode_active = mode_radio_container.add<GUI::RadioButton>("Active Layer");
m_selection_mode_foreground->on_checked = [&](bool) {
m_layer_selection_mode = LayerSelectionMode::ForegroundLayer;
};
m_selection_mode_active->on_checked = [&](bool) {
m_layer_selection_mode = LayerSelectionMode::ActiveLayer;
};
m_selection_mode_foreground->set_checked(true);
}
return m_properties_widget.ptr();
}
void MoveTool::toggle_selection_mode()
{
if (m_selection_mode_foreground->is_checked())
m_selection_mode_active->set_checked(true);
else
m_selection_mode_foreground->set_checked(true);
}
}