RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +00:00
Code Issues Activity Actions

PaintBrush: Use secondary color for eraser (like in ms_paint)

Browse source 
Comes with a checkbox to turn it off if you dislike it.
This commit is contained in:
Chyza 2019-10-15 01:34:50 +01:00 • committed by Andreas Kling
parent 110b2d52f2
commit 36bb03b6dd
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Applications/PaintBrush/EraseTool.cpp
View file

@ -28,7 +28,7 @@ void EraseTool::on_mousedown(GMouseEvent& event)
return; return;
Rect r = build_rect(event.position(), m_widget->bitmap().rect()); Rect r = build_rect(event.position(), m_widget->bitmap().rect());
GPainter painter(m_widget->bitmap()); GPainter painter(m_widget->bitmap());
painter.fill_rect(r, Color(Color::White)); painter.fill_rect(r, get_color());
m_widget->update(); m_widget->update();
} }
@ -40,7 +40,7 @@ void EraseTool::on_mousemove(GMouseEvent& event)
if (event.buttons() & GMouseButton::Left || event.buttons() & GMouseButton::Right) { if (event.buttons() & GMouseButton::Left || event.buttons() & GMouseButton::Right) {
Rect r = build_rect(event.position(), m_widget->bitmap().rect()); Rect r = build_rect(event.position(), m_widget->bitmap().rect());
GPainter painter(m_widget->bitmap()); GPainter painter(m_widget->bitmap());
painter.fill_rect(r, Color(Color::White)); painter.fill_rect(r, get_color());
m_widget->update(); m_widget->update();
} }
} }
@ -49,6 +49,17 @@ void EraseTool::on_contextmenu(GContextMenuEvent& event)
{ {
if (!m_context_menu) { if (!m_context_menu) {
m_context_menu = make<GMenu>(); m_context_menu = make<GMenu>();
NonnullRefPtr<GAction> eraser_color_toggler = GAction::create("Use secondary color", [&](GAction& action) {
bool toggled = !m_use_secondary_color;
m_use_secondary_color = toggled;
action.set_checked(toggled);
});
eraser_color_toggler->set_checkable(true);
eraser_color_toggler->set_checked(m_use_secondary_color);
m_context_menu->add_action(eraser_color_toggler);
m_context_menu->add_separator();
m_context_menu->add_action(GAction::create("1", [this](auto&) { m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1; m_thickness = 1;
})); }));
@ -62,6 +73,13 @@ void EraseTool::on_contextmenu(GContextMenuEvent& event)
m_thickness = 4; m_thickness = 4;
})); }));
} }
m_context_menu->popup(event.screen_position()); m_context_menu->popup(event.screen_position());
} }
Color EraseTool::get_color() const
{
if (m_use_secondary_color)
return m_widget->secondary_color();
return Color(Color::White);
}

3
Applications/PaintBrush/EraseTool.h
View file

@ -15,8 +15,11 @@ public:
virtual void on_contextmenu(GContextMenuEvent&) override; virtual void on_contextmenu(GContextMenuEvent&) override;
private: private:
Color get_color() const;
virtual const char* class_name() const override { return "EraseTool"; } virtual const char* class_name() const override { return "EraseTool"; }
Rect build_rect(const Point& pos, const Rect& widget_rect); Rect build_rect(const Point& pos, const Rect& widget_rect);
OwnPtr<GMenu> m_context_menu; OwnPtr<GMenu> m_context_menu;
bool m_use_secondary_color { true };
int m_thickness { 1 }; int m_thickness { 1 };
}; };