mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 13:28:11 +00:00
1d47d41c01
The problem was a bit more complex than originally anticipated, and the root of the problem is that the "coordinates" of a pixel are actually the top left of the pixel, and when we're really zoomed in, the difference in editor coordinates of the top-left and the center of the pixel is significant. So, we need to offset the "start" point when we are painting on the editor to account for this, based on the current scale. This patch adds a `editor_stroke_position` in `Tool` which can be used to compute what point (in editor coords) we should use for a given pixel and it's corresponding stroke thickness. Note that this doesn't really work well with the ellipse, since that is drawn with a different mechanism. Using this new method with the `EllipseTool` seems to give the same (or slightly worse) results, so I have not changed anything there for now.
88 lines
2.7 KiB
C++
88 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <LibGUI/Event.h>
|
|
#include <LibGUI/Forward.h>
|
|
#include <LibGUI/ValueSlider.h>
|
|
#include <LibGfx/StandardCursor.h>
|
|
|
|
namespace PixelPaint {
|
|
|
|
class ImageEditor;
|
|
class Layer;
|
|
|
|
class Tool {
|
|
public:
|
|
virtual ~Tool();
|
|
|
|
class MouseEvent {
|
|
public:
|
|
enum class Action {
|
|
MouseDown,
|
|
MouseMove,
|
|
MouseUp
|
|
};
|
|
|
|
MouseEvent(Action action, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event, GUI::MouseEvent& raw_event)
|
|
: m_action(action)
|
|
, m_layer_event(layer_event)
|
|
, m_image_event(image_event)
|
|
, m_raw_event(raw_event)
|
|
{
|
|
}
|
|
|
|
Action action() const { return m_action; }
|
|
GUI::MouseEvent const& layer_event() const { return m_layer_event; }
|
|
GUI::MouseEvent const& image_event() const { return m_image_event; }
|
|
GUI::MouseEvent const& raw_event() const { return m_raw_event; }
|
|
|
|
private:
|
|
Action m_action;
|
|
|
|
GUI::MouseEvent& m_layer_event;
|
|
GUI::MouseEvent& m_image_event;
|
|
GUI::MouseEvent& m_raw_event;
|
|
};
|
|
|
|
virtual void on_mousedown(Layer*, MouseEvent&) { }
|
|
virtual void on_mousemove(Layer*, MouseEvent&) { }
|
|
virtual void on_mouseup(Layer*, MouseEvent&) { }
|
|
virtual void on_context_menu(Layer*, GUI::ContextMenuEvent&) { }
|
|
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) { }
|
|
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) { }
|
|
virtual void on_keydown(GUI::KeyEvent&);
|
|
virtual void on_keyup(GUI::KeyEvent&) { }
|
|
virtual void on_tool_activation() { }
|
|
virtual GUI::Widget* get_properties_widget() { return nullptr; }
|
|
virtual Gfx::StandardCursor cursor() { return Gfx::StandardCursor::None; }
|
|
|
|
void clear() { m_editor = nullptr; }
|
|
void setup(ImageEditor&);
|
|
|
|
ImageEditor const* editor() const { return m_editor; }
|
|
ImageEditor* editor() { return m_editor; }
|
|
|
|
GUI::Action* action() { return m_action; }
|
|
void set_action(GUI::Action*);
|
|
|
|
protected:
|
|
Tool();
|
|
WeakPtr<ImageEditor> m_editor;
|
|
RefPtr<GUI::Action> m_action;
|
|
|
|
virtual Gfx::IntPoint editor_stroke_position(Gfx::IntPoint const& pixel_coords, int stroke_thickness) const;
|
|
|
|
void set_primary_slider(GUI::ValueSlider* primary) { m_primary_slider = primary; }
|
|
void set_secondary_slider(GUI::ValueSlider* secondary) { m_secondary_slider = secondary; }
|
|
|
|
GUI::ValueSlider* m_primary_slider { nullptr };
|
|
GUI::ValueSlider* m_secondary_slider { nullptr };
|
|
};
|
|
|
|
}
|