1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:47:46 +00:00

LibGUI: Give GTextEditor a context menu.

Now GTextEditor manages its own editing actions (cut/copy/paste/etc) and
will show a context menu containing them when requested.

Apps that want to put a GTextEditor's actions in its menu can get to the
actions via public getters. :^)
This commit is contained in:
Andreas Kling 2019-04-18 12:25:00 +02:00
parent 67d7fc94fc
commit ae3ec3fc37
6 changed files with 83 additions and 45 deletions

View file

@ -29,7 +29,7 @@ GMenu::~GMenu()
unrealize_menu();
}
void GMenu::add_action(Retained<GAction>&& action)
void GMenu::add_action(Retained<GAction> action)
{
m_items.append(make<GMenuItem>(m_menu_id, move(action)));
}

View file

@ -2,6 +2,8 @@
#include <LibGUI/GMenuItem.h>
#include <AK/Function.h>
#include <AK/Retainable.h>
#include <AK/Retained.h>
#include <AK/Vector.h>
class GAction;
@ -16,7 +18,7 @@ public:
GAction* action_at(int);
void add_action(Retained<GAction>&&);
void add_action(Retained<GAction>);
void add_separator();
void popup(const Point& screen_position);
@ -26,6 +28,7 @@ public:
private:
friend class GMenuBar;
int menu_id() const { return m_menu_id; }
int realize_menu();
void unrealize_menu();

View file

@ -2,7 +2,6 @@
#include <LibGUI/GMenu.h>
#include <AK/Badge.h>
#include <AK/OwnPtr.h>
#include <AK/Vector.h>
class GApplication;

View file

@ -1,9 +1,11 @@
#include <LibGUI/GTextEditor.h>
#include <LibGUI/GTextEditor.h>
#include <LibGUI/GScrollBar.h>
#include <LibGUI/GFontDatabase.h>
#include <LibGUI/GClipboard.h>
#include <LibGUI/GPainter.h>
#include <LibGUI/GWindow.h>
#include <LibGUI/GMenu.h>
#include <LibGUI/GAction.h>
#include <Kernel/KeyCode.h>
#include <AK/StringBuilder.h>
#include <unistd.h>
@ -22,12 +24,40 @@ GTextEditor::GTextEditor(Type type, GWidget* parent)
set_font(GFontDatabase::the().get_by_name("Csilla Thin"));
m_lines.append(make<Line>());
m_cursor = { 0, 0 };
create_actions();
}
GTextEditor::~GTextEditor()
{
}
void GTextEditor::create_actions()
{
m_undo_action = GAction::create("Undo", { Mod_Ctrl, Key_Z }, GraphicsBitmap::load_from_file("/res/icons/16x16/undo.png"), [&] (const GAction&) {
// FIXME: Undo
});
m_redo_action = GAction::create("Redo", { Mod_Ctrl, Key_Y }, GraphicsBitmap::load_from_file("/res/icons/16x16/redo.png"), [&] (const GAction&) {
// FIXME: Redo
});
m_cut_action = GAction::create("Cut", { Mod_Ctrl, Key_X }, GraphicsBitmap::load_from_file("/res/icons/cut16.png"), [&] (const GAction&) {
cut();
});
m_copy_action = GAction::create("Copy", { Mod_Ctrl, Key_C }, GraphicsBitmap::load_from_file("/res/icons/16x16/edit-copy.png"), [&] (const GAction&) {
copy();
});
m_paste_action = GAction::create("Paste", { Mod_Ctrl, Key_V }, GraphicsBitmap::load_from_file("/res/icons/paste16.png"), [&] (const GAction&) {
paste();
});
m_delete_action = GAction::create("Delete", { 0, Key_Delete }, GraphicsBitmap::load_from_file("/res/icons/16x16/delete.png"), [&] (const GAction&) {
do_delete();
});
}
void GTextEditor::set_text(const String& text)
{
if (is_single_line() && text.length() == m_lines[0]->length() && !memcmp(text.characters(), m_lines[0]->characters(), text.length()))
@ -865,6 +895,23 @@ void GTextEditor::did_change()
void GTextEditor::did_update_selection()
{
m_cut_action->set_enabled(has_selection());
m_copy_action->set_enabled(has_selection());
if (on_selection_change)
on_selection_change();
}
void GTextEditor::context_menu_event(GContextMenuEvent& event)
{
if (!m_context_menu) {
m_context_menu = make<GMenu>("GTextEditor context menu");
m_context_menu->add_action(undo_action());
m_context_menu->add_action(redo_action());
m_context_menu->add_separator();
m_context_menu->add_action(cut_action());
m_context_menu->add_action(copy_action());
m_context_menu->add_action(paste_action());
m_context_menu->add_action(delete_action());
}
m_context_menu->popup(event.screen_position());
}

View file

@ -4,6 +4,8 @@
#include <AK/Function.h>
#include <AK/HashMap.h>
class GAction;
class GMenu;
class GScrollBar;
class Painter;
@ -106,6 +108,13 @@ public:
virtual const char* class_name() const override { return "GTextEditor"; }
GAction& undo_action() { return *m_undo_action; }
GAction& redo_action() { return *m_redo_action; }
GAction& cut_action() { return *m_cut_action; }
GAction& copy_action() { return *m_copy_action; }
GAction& paste_action() { return *m_paste_action; }
GAction& delete_action() { return *m_delete_action; }
private:
virtual void paint_event(GPaintEvent&) override;
virtual void mousedown_event(GMouseEvent&) override;
@ -118,7 +127,9 @@ private:
virtual bool accepts_focus() const override { return true; }
virtual void enter_event(CEvent&) override;
virtual void leave_event(CEvent&) override;
virtual void context_menu_event(GContextMenuEvent&) override;
void create_actions();
void paint_ruler(Painter&);
void update_content_size();
void did_change();
@ -175,4 +186,11 @@ private:
int m_soft_tab_width { 4 };
int m_horizontal_content_padding { 2 };
GTextRange m_selection;
OwnPtr<GMenu> m_context_menu;
RetainPtr<GAction> m_undo_action;
RetainPtr<GAction> m_redo_action;
RetainPtr<GAction> m_cut_action;
RetainPtr<GAction> m_copy_action;
RetainPtr<GAction> m_paste_action;
RetainPtr<GAction> m_delete_action;
};