RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:37:45 +00:00
Code Issues Activity Actions

PixelPaint: Rename original_event => image_event

Browse source 
These events are in image coordinates, not really original coordinates.
This commit is contained in:
Andreas Kling 2020-05-21 21:57:57 +02:00
parent 45dfa094e9
commit 84b508befa
11 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/PixelPaint/BucketTool.h
View file

@ -35,7 +35,7 @@ public:
BucketTool(); BucketTool();
virtual ~BucketTool() override; virtual ~BucketTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
private: private:
virtual const char* class_name() const override { return "BucketTool"; } virtual const char* class_name() const override { return "BucketTool"; }

6
Applications/PixelPaint/EllipseTool.h
View file

@ -37,9 +37,9 @@ public:
EllipseTool(); EllipseTool();
virtual ~EllipseTool() override; virtual ~EllipseTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override; virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_keydown(GUI::KeyEvent&) override;

4
Applications/PixelPaint/EraseTool.h
View file

@ -38,8 +38,8 @@ public:
EraseTool(); EraseTool();
virtual ~EraseTool() override; virtual ~EraseTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
private: private:

12
Applications/PixelPaint/ImageEditor.cpp
View file

@ -153,8 +153,8 @@ void ImageEditor::mousedown_event(GUI::MouseEvent& event)
return; return;
auto layer_event = event_adjusted_for_layer(event, *m_active_layer); auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
auto original_event = event_with_pan_and_scale_applied(event); auto image_event = event_with_pan_and_scale_applied(event);
m_active_tool->on_mousedown(*m_active_layer, layer_event, original_event); m_active_tool->on_mousedown(*m_active_layer, layer_event, image_event);
} }
void ImageEditor::mousemove_event(GUI::MouseEvent& event) void ImageEditor::mousemove_event(GUI::MouseEvent& event)
@ -172,9 +172,9 @@ void ImageEditor::mousemove_event(GUI::MouseEvent& event)
if (!m_active_layer || !m_active_tool) if (!m_active_layer || !m_active_tool)
return; return;
auto layer_event = event_adjusted_for_layer(event, *m_active_layer); auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
auto original_event = event_with_pan_and_scale_applied(event); auto image_event = event_with_pan_and_scale_applied(event);
m_active_tool->on_mousemove(*m_active_layer, layer_event, original_event); m_active_tool->on_mousemove(*m_active_layer, layer_event, image_event);
} }
void ImageEditor::mouseup_event(GUI::MouseEvent& event) void ImageEditor::mouseup_event(GUI::MouseEvent& event)
@ -182,8 +182,8 @@ void ImageEditor::mouseup_event(GUI::MouseEvent& event)
if (!m_active_layer || !m_active_tool) if (!m_active_layer || !m_active_tool)
return; return;
auto layer_event = event_adjusted_for_layer(event, *m_active_layer); auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
auto original_event = event_with_pan_and_scale_applied(event); auto image_event = event_with_pan_and_scale_applied(event);
m_active_tool->on_mouseup(*m_active_layer, layer_event, original_event); m_active_tool->on_mouseup(*m_active_layer, layer_event, image_event);
} }
void ImageEditor::mousewheel_event(GUI::MouseEvent& event) void ImageEditor::mousewheel_event(GUI::MouseEvent& event)

6
Applications/PixelPaint/LineTool.h
View file

@ -37,9 +37,9 @@ public:
LineTool(); LineTool();
virtual ~LineTool() override; virtual ~LineTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override; virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_keydown(GUI::KeyEvent&) override;

8
Applications/PixelPaint/MoveTool.cpp
View file

@ -43,23 +43,23 @@ MoveTool::~MoveTool()
{ {
} }
void MoveTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent& original_event) void MoveTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent& image_event)
{ {
if (event.button() != GUI::MouseButton::Left) if (event.button() != GUI::MouseButton::Left)
return; return;
if (!layer.rect().contains(event.position())) if (!layer.rect().contains(event.position()))
return; return;
m_layer_being_moved = layer; m_layer_being_moved = layer;
m_event_origin = original_event.position(); m_event_origin = image_event.position();
m_layer_origin = layer.location(); m_layer_origin = layer.location();
m_editor->window()->set_override_cursor(GUI::StandardCursor::Move); m_editor->window()->set_override_cursor(GUI::StandardCursor::Move);
} }
void MoveTool::on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent& original_event) void MoveTool::on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent& image_event)
{ {
if (!m_layer_being_moved) if (!m_layer_being_moved)
return; return;
auto delta = original_event.position() - m_event_origin; auto delta = image_event.position() - m_event_origin;
m_layer_being_moved->set_location(m_layer_origin.translated(delta)); m_layer_being_moved->set_location(m_layer_origin.translated(delta));
m_editor->layers_did_change(); m_editor->layers_did_change();
} }

6
Applications/PixelPaint/MoveTool.h
View file

@ -35,9 +35,9 @@ public:
MoveTool(); MoveTool();
virtual ~MoveTool() override; virtual ~MoveTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_keydown(GUI::KeyEvent&) override;
virtual void on_context_menu(Layer&, GUI::ContextMenuEvent&) override; virtual void on_context_menu(Layer&, GUI::ContextMenuEvent&) override;

6
Applications/PixelPaint/PenTool.h
View file

@ -37,9 +37,9 @@ public:
PenTool(); PenTool();
virtual ~PenTool() override; virtual ~PenTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
private: private:

2
Applications/PixelPaint/PickerTool.h
View file

@ -35,7 +35,7 @@ public:
PickerTool(); PickerTool();
virtual ~PickerTool() override; virtual ~PickerTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
private: private:
virtual const char* class_name() const override { return "PickerTool"; } virtual const char* class_name() const override { return "PickerTool"; }

6
Applications/PixelPaint/RectangleTool.h
View file

@ -37,9 +37,9 @@ public:
RectangleTool(); RectangleTool();
virtual ~RectangleTool() override; virtual ~RectangleTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override; virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
virtual void on_keydown(GUI::KeyEvent&) override; virtual void on_keydown(GUI::KeyEvent&) override;

6
Applications/PixelPaint/SprayTool.h
View file

@ -38,9 +38,9 @@ public:
SprayTool(); SprayTool();
virtual ~SprayTool() override; virtual ~SprayTool() override;
virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override; virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override; virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
private: private: