Fixing 'click' event handling:

http://code.google.com/p/o3d/issues/detail?id=98

Review URL: http://codereview.chromium.org/160051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21791 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/o3d/core/cross/event_manager.cc b/o3d/core/cross/event_manager.cc
index 273566b..0712e4c 100644
--- a/o3d/core/cross/event_manager.cc
+++ b/o3d/core/cross/event_manager.cc
@@ -76,7 +76,12 @@ void EventManager::ClearEventCallback(Event::Type type) {
 void EventManager::AddEventToQueue(const Event& event) {
   // If we're shutting down or there's no callback registered to handle
   // this event type, we drop it.
-  if (valid_ && event_callbacks_[event.type()].IsSet()) {
+  // NOTE:If we have a callback registered for the click event then we allow
+  // MOUSEDOWN and MOUSEUP events through.
+  if (valid_ && (event_callbacks_[event.type()].IsSet() ||
+                 (event_callbacks_[Event::TYPE_CLICK].IsSet() &&
+                  (event.type() == Event::TYPE_MOUSEDOWN ||
+                   event.type() == Event::TYPE_MOUSEUP)))) {
     if (!event_queue_.empty()) {
       switch (event.type()) {
         case Event::TYPE_MOUSEMOVE:
@@ -127,7 +132,8 @@ void EventManager::AddEventToQueue(const Event& event) {
       }
     }
 
-    event_queue_.push_back(event);
+    if (event_callbacks_[event.type()].IsSet())
+      event_queue_.push_back(event);
 
     if (event.type() == Event::TYPE_MOUSEUP) {
       if (mousedown_in_plugin_ && event.in_plugin()) {