beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

PixelPaint: Let PickerTool optionally sample all layers

Browse source 
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
Notes: sideshowbarker 2024-07-18 04:07:34 +09:00 
Author: https://github.com/mustafaquraish
Commit: https://github.com/SerenityOS/serenity/commit/2afa28d297b
Pull-request: https://github.com/SerenityOS/serenity/pull/9719
Reviewed-by: https://github.com/metmo
4 changed files with 58 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -532,4 +532,19 @@ void Image::crop(Gfx::IntRect const& cropped_rect)
did_change_rect(cropped_rect);
}
Color Image::color_at(Gfx::IntPoint const& point) const
{
Color color;
for (auto& layer : m_layers) {
if (!layer.is_visible() || !layer.rect().contains(point))
continue;
auto layer_color = layer.bitmap().get_pixel(point);
float layer_opacity = layer.opacity_percent() / 100.0f;
layer_color.set_alpha((u8)(layer_color.alpha() * layer_opacity));
color = color.blend(layer_color);
}
return color;
}
}

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

@ -103,6 +103,8 @@ public:
void rotate(Gfx::RotationDirection direction);
void crop(Gfx::IntRect const& rect);
Color color_at(Gfx::IntPoint const& point) const;
private:
explicit Image(Gfx::IntSize const&);

41
Userland/Applications/PixelPaint/PickerTool.cpp
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();
}
}

7
Userland/Applications/PixelPaint/PickerTool.h
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
*/
@ -16,7 +17,13 @@ public:
virtual ~PickerTool() override;
virtual void on_mousedown(Layer*, MouseEvent&) override;
virtual GUI::Widget* get_properties_widget() override;
virtual Gfx::StandardCursor cursor() override { return Gfx::StandardCursor::Eyedropper; }
private:
RefPtr<GUI::Widget> m_properties_widget;
bool m_sample_all_layers { false };
};
}