From 15e9d0b4d897ebcc6bf43ba83c81fddc839c327d Mon Sep 17 00:00:00 2001
From: Marcus Nilsson <brainbomb@gmail.com>
Date: Mon, 2 Aug 2021 21:16:46 +0200
Subject: [PATCH] PixelPaint: Remove context menu for SprayTool

Remove the context menu for SprayTool and just use the tool properties
widget for options.
---
 .../Applications/PixelPaint/SprayTool.cpp     | 21 -------------------
 Userland/Applications/PixelPaint/SprayTool.h  |  3 ---
 2 files changed, 24 deletions(-)

diff --git a/Userland/Applications/PixelPaint/SprayTool.cpp b/Userland/Applications/PixelPaint/SprayTool.cpp
index c2fae6c93c..8e3d04a632 100644
--- a/Userland/Applications/PixelPaint/SprayTool.cpp
+++ b/Userland/Applications/PixelPaint/SprayTool.cpp
@@ -88,27 +88,6 @@ void SprayTool::on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&)
     }
 }
 
-void SprayTool::on_tool_button_contextmenu(GUI::ContextMenuEvent& event)
-{
-    if (!m_context_menu) {
-        m_context_menu = GUI::Menu::construct();
-        m_thickness_actions.set_exclusive(true);
-        auto insert_action = [&](int size, bool checked = false) {
-            auto action = GUI::Action::create_checkable(String::number(size), [this, size](auto&) {
-                m_thickness = size;
-            });
-            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());
-}
-
 GUI::Widget* SprayTool::get_properties_widget()
 {
     if (!m_properties_widget) {
diff --git a/Userland/Applications/PixelPaint/SprayTool.h b/Userland/Applications/PixelPaint/SprayTool.h
index 5b2a80fe5a..551056d06b 100644
--- a/Userland/Applications/PixelPaint/SprayTool.h
+++ b/Userland/Applications/PixelPaint/SprayTool.h
@@ -21,7 +21,6 @@ public:
     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& image_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 GUI::Widget* get_properties_widget() override;
 
 private:
@@ -31,8 +30,6 @@ private:
     RefPtr<Core::Timer> m_timer;
     Gfx::IntPoint m_last_pos;
     Color m_color;
-    RefPtr<GUI::Menu> m_context_menu;
-    GUI::ActionGroup m_thickness_actions;
     int m_thickness { 10 };
     int m_density { 40 };
 };