From 98fa99ae42aefd520a89558667b99f92e96d52a9 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 13 Jan 2021 16:08:42 +0300 Subject: [PATCH] Fixed mouse clicking on disabled context menu items. --- ui/widgets/menu/menu_item_base.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/widgets/menu/menu_item_base.cpp b/ui/widgets/menu/menu_item_base.cpp index 9340e6b..3f7ca00 100644 --- a/ui/widgets/menu/menu_item_base.cpp +++ b/ui/widgets/menu/menu_item_base.cpp @@ -59,9 +59,11 @@ rpl::producer ItemBase::clicks() const { return rpl::merge( AbstractButton::clicks() | rpl::to_empty, _clicks.events() - ) | rpl::map([=]() -> CallbackData { + ) | rpl::filter([=] { + return isEnabled(); + }) | rpl::map([=]() -> CallbackData { return { action(), y(), _lastTriggeredSource, _index, true }; - });; + }); } rpl::producer ItemBase::contentWidthValue() const {