From d4a570d576f7b8aeb9f9a7656b57a725d9bb2fbe Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 15 Dec 2019 17:02:02 +0100 Subject: [PATCH] LibGUI: Fix GTreeView not showing the context menu This logic is all taken care of by GAbstractColumnView now, so we can simply delete GTreeView::context_menu_event(). :^) Fixes an issue mentioned in #826 --- Libraries/LibGUI/GTreeView.cpp | 13 ------------- Libraries/LibGUI/GTreeView.h | 1 - 2 files changed, 14 deletions(-) diff --git a/Libraries/LibGUI/GTreeView.cpp b/Libraries/LibGUI/GTreeView.cpp index cd97258d85..13142ae39c 100644 --- a/Libraries/LibGUI/GTreeView.cpp +++ b/Libraries/LibGUI/GTreeView.cpp @@ -393,19 +393,6 @@ void GTreeView::keydown_event(GKeyEvent& event) } } -void GTreeView::context_menu_event(GContextMenuEvent& event) -{ - if (!model()) - return; - bool is_toggle; - auto index = index_at_event_position(event.position(), is_toggle); - if (index.is_valid()) { - if (on_context_menu_request) - on_context_menu_request(index, event); - } - GAbstractColumnView::context_menu_event(event); -} - int GTreeView::item_count() const { int count = 0; diff --git a/Libraries/LibGUI/GTreeView.h b/Libraries/LibGUI/GTreeView.h index bbcf99f1a1..d6d0a01b6b 100644 --- a/Libraries/LibGUI/GTreeView.h +++ b/Libraries/LibGUI/GTreeView.h @@ -19,7 +19,6 @@ protected: virtual void keydown_event(GKeyEvent&) override; virtual void did_update_selection() override; virtual void did_update_model() override; - virtual void context_menu_event(GContextMenuEvent&) override; private: virtual GModelIndex index_at_event_position(const Point&, bool& is_toggle) const override;