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

PixelPaint: Change tool keydown handle to non-const

Browse source 
This was changed to const in PR #15788 but presents problems for tools
that may need to forward this event to non-const event handlers.
This commit is contained in:
Timothy Slater 2022-11-16 17:31:31 -06:00 • committed by Sam Atkins
parent 159f6cf0ac
commit 296b76095f
20 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/PixelPaint/Tools/CloneTool.cpp
View file

@ -114,7 +114,7 @@ void CloneTool::on_second_paint(Layer const*, GUI::PaintEvent& event)
painter.draw_ellipse_intersecting(rect, m_marker_color, 1); painter.draw_ellipse_intersecting(rect, m_marker_color, 1);
} }
bool CloneTool::on_keydown(GUI::KeyEvent const& event) bool CloneTool::on_keydown(GUI::KeyEvent& event)
{ {
if (event.key() == KeyCode::Key_Alt && !m_is_selecting_location) { if (event.key() == KeyCode::Key_Alt && !m_is_selecting_location) {
m_is_selecting_location = true; m_is_selecting_location = true;

2
Userland/Applications/PixelPaint/Tools/CloneTool.h
View file

@ -27,7 +27,7 @@ protected:
virtual void on_mousedown(Layer*, MouseEvent&) override; virtual void on_mousedown(Layer*, MouseEvent&) override;
virtual void on_mousemove(Layer*, MouseEvent&) override; virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_keyup(GUI::KeyEvent&) override; virtual void on_keyup(GUI::KeyEvent&) override;
private: private:

2
Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
View file

@ -116,7 +116,7 @@ void EllipseTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
draw_using(painter, preview_start, preview_end, AK::max(m_thickness * m_editor->scale(), 1)); draw_using(painter, preview_start, preview_end, AK::max(m_thickness * m_editor->scale(), 1));
} }
bool EllipseTool::on_keydown(GUI::KeyEvent const& event) bool EllipseTool::on_keydown(GUI::KeyEvent& event)
{ {
if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) { if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) {
m_drawing_button = GUI::MouseButton::None; m_drawing_button = GUI::MouseButton::None;

2
Userland/Applications/PixelPaint/Tools/EllipseTool.h
View file

@ -24,7 +24,7 @@ public:
virtual void on_mousemove(Layer*, MouseEvent&) override; virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_mouseup(Layer*, MouseEvent&) override; virtual void on_mouseup(Layer*, MouseEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; } virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; }

2
Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp
View file

@ -147,7 +147,7 @@ void LassoSelectTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event
painter.stroke_path(m_preview_path, Gfx::Color::Black, 1); painter.stroke_path(m_preview_path, Gfx::Color::Black, 1);
} }
bool LassoSelectTool::on_keydown(GUI::KeyEvent const& key_event) bool LassoSelectTool::on_keydown(GUI::KeyEvent& key_event)
{ {
Tool::on_keydown(key_event); Tool::on_keydown(key_event);
if (key_event.key() == KeyCode::Key_Escape) { if (key_event.key() == KeyCode::Key_Escape) {

2
Userland/Applications/PixelPaint/Tools/LassoSelectTool.h
View file

@ -23,7 +23,7 @@ public:
virtual void on_mousedown(Layer*, MouseEvent& event) override; virtual void on_mousedown(Layer*, MouseEvent& event) override;
virtual void on_mouseup(Layer*, MouseEvent& event) override; virtual void on_mouseup(Layer*, MouseEvent& event) override;
virtual void on_mousemove(Layer*, MouseEvent& event) override; virtual void on_mousemove(Layer*, MouseEvent& event) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;

2
Userland/Applications/PixelPaint/Tools/LineTool.cpp
View file

@ -124,7 +124,7 @@ void LineTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
draw_using(painter, preview_start, preview_end, m_editor->color_for(m_drawing_button), AK::max(m_thickness * m_editor->scale(), 1)); draw_using(painter, preview_start, preview_end, m_editor->color_for(m_drawing_button), AK::max(m_thickness * m_editor->scale(), 1));
} }
bool LineTool::on_keydown(GUI::KeyEvent const& event) bool LineTool::on_keydown(GUI::KeyEvent& event)
{ {
if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) { if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) {
m_drawing_button = GUI::MouseButton::None; m_drawing_button = GUI::MouseButton::None;

2
Userland/Applications/PixelPaint/Tools/LineTool.h
View file

@ -22,7 +22,7 @@ public:
virtual void on_mousemove(Layer*, MouseEvent&) override; virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_mouseup(Layer*, MouseEvent&) override; virtual void on_mouseup(Layer*, MouseEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; } virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; }

2
Userland/Applications/PixelPaint/Tools/MoveTool.cpp
View file

@ -106,7 +106,7 @@ void MoveTool::on_mouseup(Layer* layer, MouseEvent& event)
m_editor->did_complete_action(tool_name()); m_editor->did_complete_action(tool_name());
} }
bool MoveTool::on_keydown(GUI::KeyEvent const& event) bool MoveTool::on_keydown(GUI::KeyEvent& event)
{ {
if (event.key() == Key_Shift) if (event.key() == Key_Shift)
m_keep_ascept_ratio = true; m_keep_ascept_ratio = true;

2
Userland/Applications/PixelPaint/Tools/MoveTool.h
View file

@ -20,7 +20,7 @@ public:
virtual void on_mousedown(Layer*, MouseEvent&) override; virtual void on_mousedown(Layer*, MouseEvent&) override;
virtual void on_mousemove(Layer*, MouseEvent&) override; virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_mouseup(Layer*, MouseEvent&) override; virtual void on_mouseup(Layer*, MouseEvent&) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_keyup(GUI::KeyEvent&) override; virtual void on_keyup(GUI::KeyEvent&) override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override; virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override;

2
Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp
View file

@ -150,7 +150,7 @@ void PolygonalSelectTool::on_second_paint(Layer const* layer, GUI::PaintEvent& e
painter.draw_line(last_line_start, last_line_stop, Color::Black, 1); painter.draw_line(last_line_start, last_line_stop, Color::Black, 1);
} }
bool PolygonalSelectTool::on_keydown(GUI::KeyEvent const& key_event) bool PolygonalSelectTool::on_keydown(GUI::KeyEvent& key_event)
{ {
if (key_event.key() == KeyCode::Key_Escape) { if (key_event.key() == KeyCode::Key_Escape) {
if (m_selecting) { if (m_selecting) {

2
Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.h
View file

@ -20,7 +20,7 @@ public:
virtual void on_doubleclick(Layer*, MouseEvent& event) override; virtual void on_doubleclick(Layer*, MouseEvent& event) override;
virtual void on_mousedown(Layer*, MouseEvent& event) override; virtual void on_mousedown(Layer*, MouseEvent& event) override;
virtual void on_mousemove(Layer*, MouseEvent& event) override; virtual void on_mousemove(Layer*, MouseEvent& event) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; } virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; }

2
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
View file

@ -103,7 +103,7 @@ void RectangleSelectTool::on_mouseup(Layer*, MouseEvent& event)
m_editor->did_complete_action(tool_name()); m_editor->did_complete_action(tool_name());
} }
bool RectangleSelectTool::on_keydown(GUI::KeyEvent const& key_event) bool RectangleSelectTool::on_keydown(GUI::KeyEvent& key_event)
{ {
if (key_event.key() == KeyCode::Key_Space) { if (key_event.key() == KeyCode::Key_Space) {
m_moving_mode = MovingMode::MovingOrigin; m_moving_mode = MovingMode::MovingOrigin;

2
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h
View file

@ -23,7 +23,7 @@ public:
virtual void on_mousedown(Layer*, MouseEvent& event) override; virtual void on_mousedown(Layer*, MouseEvent& event) override;
virtual void on_mousemove(Layer*, MouseEvent& event) override; virtual void on_mousemove(Layer*, MouseEvent& event) override;
virtual void on_mouseup(Layer*, MouseEvent& event) override; virtual void on_mouseup(Layer*, MouseEvent& event) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_keyup(GUI::KeyEvent&) override; virtual void on_keyup(GUI::KeyEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;

2
Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
View file

@ -130,7 +130,7 @@ void RectangleTool::on_second_paint(Layer const* layer, GUI::PaintEvent& event)
draw_using(painter, start_position, end_position, AK::max(m_thickness * m_editor->scale(), 1), m_corner_radius * m_editor->scale()); draw_using(painter, start_position, end_position, AK::max(m_thickness * m_editor->scale(), 1), m_corner_radius * m_editor->scale());
} }
bool RectangleTool::on_keydown(GUI::KeyEvent const& event) bool RectangleTool::on_keydown(GUI::KeyEvent& event)
{ {
if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) { if (event.key() == Key_Escape && m_drawing_button != GUI::MouseButton::None) {
m_drawing_button = GUI::MouseButton::None; m_drawing_button = GUI::MouseButton::None;

2
Userland/Applications/PixelPaint/Tools/RectangleTool.h
View file

@ -23,7 +23,7 @@ public:
virtual void on_mousemove(Layer*, MouseEvent&) override; virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_mouseup(Layer*, MouseEvent&) override; virtual void on_mouseup(Layer*, MouseEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override; virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; } virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; }

2
Userland/Applications/PixelPaint/Tools/Tool.cpp
View file

@ -23,7 +23,7 @@ void Tool::set_action(GUI::Action* action)
m_action = action; m_action = action;
} }
bool Tool::on_keydown(GUI::KeyEvent const& event) bool Tool::on_keydown(GUI::KeyEvent& event)
{ {
switch (event.key()) { switch (event.key()) {
case KeyCode::Key_LeftBracket: case KeyCode::Key_LeftBracket:

2
Userland/Applications/PixelPaint/Tools/Tool.h
View file

@ -61,7 +61,7 @@ public:
virtual void on_context_menu(Layer*, GUI::ContextMenuEvent&) { } virtual void on_context_menu(Layer*, GUI::ContextMenuEvent&) { }
virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) { } virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) { }
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) { } virtual void on_second_paint(Layer const*, GUI::PaintEvent&) { }
virtual bool on_keydown(GUI::KeyEvent const&); virtual bool on_keydown(GUI::KeyEvent&);
virtual void on_keyup(GUI::KeyEvent&) { } virtual void on_keyup(GUI::KeyEvent&) { }
virtual void on_tool_activation() { } virtual void on_tool_activation() { }
virtual void on_tool_deactivation() { } virtual void on_tool_deactivation() { }

2
Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp
View file

@ -37,7 +37,7 @@ static void set_flood_selection(Gfx::Bitmap& bitmap, Image& image, Gfx::IntPoint
image.selection().merge(selection_mask, merge_mode); image.selection().merge(selection_mask, merge_mode);
} }
bool WandSelectTool::on_keydown(GUI::KeyEvent const& key_event) bool WandSelectTool::on_keydown(GUI::KeyEvent& key_event)
{ {
if (key_event.key() == KeyCode::Key_Escape) { if (key_event.key() == KeyCode::Key_Escape) {
m_editor->image().selection().clear(); m_editor->image().selection().clear();

2
Userland/Applications/PixelPaint/Tools/WandSelectTool.h
View file

@ -22,7 +22,7 @@ public:
virtual ~WandSelectTool() = default; virtual ~WandSelectTool() = default;
virtual void on_mousedown(Layer*, MouseEvent& event) override; virtual void on_mousedown(Layer*, MouseEvent& event) override;
virtual bool on_keydown(GUI::KeyEvent const&) override; virtual bool on_keydown(GUI::KeyEvent&) override;
virtual GUI::Widget* get_properties_widget() override; virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; } virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override { return Gfx::StandardCursor::Crosshair; }