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

PaintBrush: Show which line thickness is selected in the tool menus

Browse source 
Put each tool's thickness altering actions into a GActionGroup and make
them mutually exclusive so we get that nice radio button appearance.

This all feel very clunky and we should move towards having something
like a "tool settings" pane that gets populated by the currently active
tool instead.
This commit is contained in:
Andreas Kling 2020-01-21 13:47:57 +01:00
parent 07075cd001
commit 1060d59ddd
10 changed files with 87 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Applications/PaintBrush/EllipseTool.cpp
View file

@ -115,18 +115,21 @@ void EllipseTool::on_contextmenu(GContextMenuEvent& event)
m_mode = Mode::Outline;
}));
m_context_menu->add_separator();
m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1;
}));
m_context_menu->add_action(GAction::create("2", [this](auto&) {
m_thickness = 2;
}));
m_context_menu->add_action(GAction::create("3", [this](auto&) {
m_thickness = 3;
}));
m_context_menu->add_action(GAction::create("4", [this](auto&) {
m_thickness = 4;
}));
m_thickness_actions.set_exclusive(true);
auto insert_action = [&](int size, bool checked = false) {
auto action = GAction::create(String::number(size), [this, size](auto& action) {
m_thickness = size;
action.set_checked(true);
});
action->set_checkable(true);
action->set_checked(checked);
m_thickness_actions.add_action(*action);
m_context_menu->add_action(move(action));
};
insert_action(1, true);
insert_action(2);
insert_action(3);
insert_action(4);
}
m_context_menu->popup(event.screen_position());
}

2
Applications/PaintBrush/EllipseTool.h
View file

@ -28,6 +28,7 @@
#include "Tool.h"
#include <LibDraw/Point.h>
#include <LibGUI/GActionGroup.h>
class GMenu;
class Painter;
@ -58,5 +59,6 @@ private:
Point m_ellipse_end_position;
RefPtr<GMenu> m_context_menu;
int m_thickness { 1 };
GActionGroup m_thickness_actions;
Mode m_mode { Mode::Outline };
};

28
Applications/PaintBrush/EraseTool.cpp
View file

@ -86,18 +86,22 @@ void EraseTool::on_contextmenu(GContextMenuEvent& event)
m_context_menu->add_action(eraser_color_toggler);
m_context_menu->add_separator();
m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1;
}));
m_context_menu->add_action(GAction::create("2", [this](auto&) {
m_thickness = 2;
}));
m_context_menu->add_action(GAction::create("3", [this](auto&) {
m_thickness = 3;
}));
m_context_menu->add_action(GAction::create("4", [this](auto&) {
m_thickness = 4;
}));
m_thickness_actions.set_exclusive(true);
auto insert_action = [&](int size, bool checked = false) {
auto action = GAction::create(String::number(size), [this, size](auto& action) {
m_thickness = size;
action.set_checked(true);
});
action->set_checkable(true);
action->set_checked(checked);
m_thickness_actions.add_action(*action);
m_context_menu->add_action(move(action));
};
insert_action(1, true);
insert_action(2);
insert_action(3);
insert_action(4);
}
m_context_menu->popup(event.screen_position());

2
Applications/PaintBrush/EraseTool.h
View file

@ -28,6 +28,7 @@
#include "Tool.h"
#include <LibDraw/Point.h>
#include <LibGUI/GActionGroup.h>
class GMenu;
@ -48,4 +49,5 @@ private:
bool m_use_secondary_color { true };
int m_thickness { 1 };
GActionGroup m_thickness_actions;
};

27
Applications/PaintBrush/LineTool.cpp
View file

@ -131,18 +131,21 @@ void LineTool::on_contextmenu(GContextMenuEvent& event)
{
if (!m_context_menu) {
m_context_menu = GMenu::construct();
m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1;
}));
m_context_menu->add_action(GAction::create("2", [this](auto&) {
m_thickness = 2;
}));
m_context_menu->add_action(GAction::create("3", [this](auto&) {
m_thickness = 3;
}));
m_context_menu->add_action(GAction::create("4", [this](auto&) {
m_thickness = 4;
}));
m_thickness_actions.set_exclusive(true);
auto insert_action = [&](int size, bool checked = false) {
auto action = GAction::create(String::number(size), [this, size](auto& action) {
m_thickness = size;
action.set_checked(true);
});
action->set_checkable(true);
action->set_checked(checked);
m_thickness_actions.add_action(*action);
m_context_menu->add_action(move(action));
};
insert_action(1, true);
insert_action(2);
insert_action(3);
insert_action(4);
}
m_context_menu->popup(event.screen_position());
}

2
Applications/PaintBrush/LineTool.h
View file

@ -28,6 +28,7 @@
#include "Tool.h"
#include <LibDraw/Point.h>
#include <LibGUI/GActionGroup.h>
class GMenu;
@ -51,6 +52,7 @@ private:
Point m_line_start_position;
Point m_line_end_position;
RefPtr<GMenu> m_context_menu;
GActionGroup m_thickness_actions;
int m_thickness { 1 };
bool m_constrain_angle { false };
};

27
Applications/PaintBrush/PenTool.cpp
View file

@ -77,18 +77,21 @@ void PenTool::on_contextmenu(GContextMenuEvent& event)
{
if (!m_context_menu) {
m_context_menu = GMenu::construct();
m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1;
}));
m_context_menu->add_action(GAction::create("2", [this](auto&) {
m_thickness = 2;
}));
m_context_menu->add_action(GAction::create("3", [this](auto&) {
m_thickness = 3;
}));
m_context_menu->add_action(GAction::create("4", [this](auto&) {
m_thickness = 4;
}));
m_thickness_actions.set_exclusive(true);
auto insert_action = [&](int size, bool checked = false) {
auto action = GAction::create(String::number(size), [this, size](auto& action) {
m_thickness = size;
action.set_checked(true);
});
action->set_checkable(true);
action->set_checked(checked);
m_thickness_actions.add_action(*action);
m_context_menu->add_action(move(action));
};
insert_action(1, true);
insert_action(2);
insert_action(3);
insert_action(4);
}
m_context_menu->popup(event.screen_position());
}

2
Applications/PaintBrush/PenTool.h
View file

@ -28,6 +28,7 @@
#include "Tool.h"
#include <LibDraw/Point.h>
#include <LibGUI/GActionGroup.h>
class GMenu;
@ -47,4 +48,5 @@ private:
Point m_last_drawing_event_position { -1, -1 };
RefPtr<GMenu> m_context_menu;
int m_thickness { 1 };
GActionGroup m_thickness_actions;
};

27
Applications/PaintBrush/SprayTool.cpp
View file

@ -103,18 +103,21 @@ void SprayTool::on_contextmenu(GContextMenuEvent& event)
{
if (!m_context_menu) {
m_context_menu = GMenu::construct();
m_context_menu->add_action(GAction::create("1", [this](auto&) {
m_thickness = 1;
}));
m_context_menu->add_action(GAction::create("2", [this](auto&) {
m_thickness = 2;
}));
m_context_menu->add_action(GAction::create("3", [this](auto&) {
m_thickness = 3;
}));
m_context_menu->add_action(GAction::create("4", [this](auto&) {
m_thickness = 4;
}));
m_thickness_actions.set_exclusive(true);
auto insert_action = [&](int size, bool checked = false) {
auto action = GAction::create(String::number(size), [this, size](auto& action) {
m_thickness = size;
action.set_checked(true);
});
action->set_checkable(true);
action->set_checked(checked);
m_thickness_actions.add_action(*action);
m_context_menu->add_action(move(action));
};
insert_action(1, true);
insert_action(2);
insert_action(3);
insert_action(4);
}
m_context_menu->popup(event.screen_position());
}

4
Applications/PaintBrush/SprayTool.h
View file

@ -27,8 +27,9 @@
#pragma once
#include "Tool.h"
#include <LibGUI/GPainter.h>
#include <LibCore/CTimer.h>
#include <LibGUI/GActionGroup.h>
#include <LibGUI/GPainter.h>
class GMenu;
@ -49,5 +50,6 @@ private:
Point m_last_pos;
Color m_color;
RefPtr<GMenu> m_context_menu;
GActionGroup m_thickness_actions;
int m_thickness { 1 };
};