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

PixelPaint: Make Alt-Clicking with all tool act like the PickerTool

Browse source 
Refactored PickerTool functionality to the ImageEditor level and added a
flag to Tool Base Class to allow for tools to override Alt+Click
ColorPicker functionality
This commit is contained in:
Fausto Tommasi 2022-10-13 21:32:23 -05:00 • committed by Linus Groh
parent 66c039c66f
commit 813ca5ebbe
6 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,6 +305,29 @@ GUI::MouseEvent ImageEditor::event_adjusted_for_layer(GUI::MouseEvent const& eve
};
}
void ImageEditor::set_editor_color_to_color_at_mouse_position(GUI::MouseEvent const& event, bool sample_all_layers = false)
{
auto position = event.position();
Color color;
auto layer = active_layer();
if (sample_all_layers) {
color = image().color_at(position);
} else {
if (!layer || !layer->rect().contains(position))
return;
color = layer->currently_edited_bitmap().get_pixel(position);
}
// We picked a transparent pixel, do nothing.
if (!color.alpha())
return;
if (event.button() == GUI::MouseButton::Primary)
set_primary_color(color);
else if (event.button() == GUI::MouseButton::Secondary)
set_secondary_color(color);
}
void ImageEditor::mousedown_event(GUI::MouseEvent& event)
{
if (event.button() == GUI::MouseButton::Middle) {
@ -313,6 +336,11 @@ void ImageEditor::mousedown_event(GUI::MouseEvent& event)
return;
}
if (event.alt() && !m_active_tool->is_overriding_alt()) {
set_editor_color_to_color_at_mouse_position(event);
return; // Pick Color instead of acivating active tool when holding alt.
}
if (!m_active_tool)
return;