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

PixelPaint: Draw the current editor selection as marching ants

Browse source 
This patch moves the marching ants painting code to Selection and
unifies the timer mechanism so that all marching ants are synchronized
which looks neat. :^)
This commit is contained in:
Andreas Kling 2021-06-14 17:45:59 +02:00
parent 1b897ec561
commit 4cecd79000
5 changed files with 51 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Userland/Applications/PixelPaint/RectangleSelectTool.cpp
View file

@ -5,26 +5,14 @@
*/
#include "RectangleSelectTool.h"
#include "Image.h"
#include "ImageEditor.h"
#include "Layer.h"
#include <LibCore/Timer.h>
#include <LibGUI/Painter.h>
namespace PixelPaint {
constexpr int marching_ant_length = 4;
RectangleSelectTool::RectangleSelectTool()
{
m_marching_ants_timer = Core::Timer::create_repeating(80, [this] {
if (!m_editor)
return;
++m_marching_ants_offset;
m_marching_ants_offset %= marching_ant_length;
m_editor->update();
});
m_marching_ants_timer->start();
}
RectangleSelectTool::~RectangleSelectTool()
@ -63,33 +51,6 @@ void RectangleSelectTool::on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&
m_editor->selection().set(rect_in_image);
}
void RectangleSelectTool::draw_marching_ants(Gfx::Painter& painter, Gfx::IntRect const& rect) const
{
int offset = m_marching_ants_offset;
auto draw_pixel = [&](int x, int y) {
if ((offset % marching_ant_length) != 0)
painter.set_pixel(x, y, Color::Black);
offset++;
};
// Top line
for (int x = rect.left(); x <= rect.right(); ++x)
draw_pixel(x, rect.top());
// Right line
for (int y = rect.top() + 1; y <= rect.bottom(); ++y)
draw_pixel(rect.right(), y);
// Bottom line
for (int x = rect.right() - 1; x >= rect.left(); --x)
draw_pixel(x, rect.bottom());
// Left line
for (int y = rect.bottom() - 1; y > rect.top(); --y)
draw_pixel(rect.left(), y);
}
void RectangleSelectTool::on_second_paint(Layer const&, GUI::PaintEvent& event)
{
if (!m_selecting)
@ -101,7 +62,7 @@ void RectangleSelectTool::on_second_paint(Layer const&, GUI::PaintEvent& event)
auto rect_in_image = Gfx::IntRect::from_two_points(m_selection_start, m_selection_end);
auto rect_in_editor = m_editor->image_rect_to_editor_rect(rect_in_image);
draw_marching_ants(painter, rect_in_editor.to_type<int>());
m_editor->selection().draw_marching_ants(painter, rect_in_editor.to_type<int>());
}
}