Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: ui/base/events/event.cc

Issue 11761027: context menu does not work if one already open (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: crbug.com/151074 Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_controller.h » ('j') | ui/views/controls/menu/menu_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event.cc
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc
index e999f3334375acdb3ea16b1a62e598476e693555..dacd299aa953dc2f783e3c6570e4eed2e3d1bac3 100644
--- a/ui/base/events/event.cc
+++ b/ui/base/events/event.cc
@@ -104,6 +104,14 @@ std::string EventTypeName(ui::EventType type) {
return std::string();
}
+bool IsX11SendEventTrue(const base::NativeEvent& event) {
+#if defined(USE_X11)
+ if (event && event->xany.send_event)
+ return true;
+#endif
+ return false;
+}
+
} // namespace
namespace ui {
@@ -317,7 +325,9 @@ bool MouseEvent::IsRepeatedClickEvent(
int MouseEvent::GetRepeatCount(const MouseEvent& event) {
int click_count = 1;
if (last_click_event_) {
- if (IsRepeatedClickEvent(*last_click_event_, event))
+ if (IsX11SendEventTrue(event.native_event()))
+ click_count = last_click_event_->GetClickCount();
+ else if (IsRepeatedClickEvent(*last_click_event_, event))
click_count = last_click_event_->GetClickCount() + 1;
delete last_click_event_;
}
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_controller.h » ('j') | ui/views/controls/menu/menu_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698