1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:47:44 +00:00

PixelPaint: Let PickerTool optionally sample all layers

Previously, only the color from the selected layer would be picked.
Now, we allow the user to select if they want to sample the color
from all layers.
This commit is contained in:
Mustafa Quraish 2021-09-01 00:12:15 -04:00 committed by Andreas Kling
parent 640a980080
commit 2afa28d297
4 changed files with 58 additions and 7 deletions

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -7,6 +8,8 @@
#include "PickerTool.h"
#include "ImageEditor.h"
#include "Layer.h"
#include <LibGUI/BoxLayout.h>
#include <LibGUI/CheckBox.h>
namespace PixelPaint {
@ -20,17 +23,41 @@ PickerTool::~PickerTool()
void PickerTool::on_mousedown(Layer* layer, MouseEvent& event)
{
if (!layer)
auto& position = event.layer_event().position();
Color color;
if (m_sample_all_layers) {
color = m_editor->image().color_at(position);
} else {
if (!layer || !layer->rect().contains(position))
return;
color = layer->bitmap().get_pixel(position);
}
// We picked a transparent pixel, do nothing.
if (!color.alpha())
return;
auto& layer_event = event.layer_event();
if (!layer->rect().contains(layer_event.position()))
return;
auto color = layer->bitmap().get_pixel(layer_event.position());
if (layer_event.button() == GUI::MouseButton::Left)
if (event.layer_event().button() == GUI::MouseButton::Left)
m_editor->set_primary_color(color);
else if (layer_event.button() == GUI::MouseButton::Right)
else if (event.layer_event().button() == GUI::MouseButton::Right)
m_editor->set_secondary_color(color);
}
GUI::Widget* PickerTool::get_properties_widget()
{
if (!m_properties_widget) {
m_properties_widget = GUI::Widget::construct();
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto& sample_checkbox = m_properties_widget->add<GUI::CheckBox>("Sample all layers");
sample_checkbox.set_checked(m_sample_all_layers);
sample_checkbox.on_checked = [&](bool value) {
m_sample_all_layers = value;
};
}
return m_properties_widget.ptr();
}
}