Changeset 32798 in webkit

Timestamp:

May 1, 2008 10:16:42 PM (16 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Eric Seidel.

Make sure we properly set the button for all mouse events, not just mouse down, set the click count to 0 for non-click events, and finally set the timestamp.

​https://bugs.webkit.org/show_bug.cgi?id=18464

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wx/MouseEventWx.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-01  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Reviewed by Eric Seidel.
+
+        Make sure we properly set the button for all mouse events,
+        not just mouse down, set the click count to 0
+        for non-click events, and finally set the timestamp.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=18464
+
+        * platform/wx/MouseEventWx.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+
 2008-05-01  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/platform/wx/MouseEventWx.cpp

@@ -25 +25 @@
 
 #include "config.h"
+#include "Assertions.h"
 #include "PlatformMouseEvent.h"
+#include "SystemTime.h"
 
 #include <wx/defs.h>
@@ -35 +37 @@
     : m_position(event.GetPosition())
     , m_globalPosition(globalPoint)
-    , m_clickCount(event.ButtonDClick() ? 2 : 1)
     , m_shiftKey(event.ShiftDown())
     , m_ctrlKey(event.CmdDown())
@@ -54 +55 @@
         m_eventType = MouseEventMoved;
 
-    if (event.LeftIsDown())
+    if (event.Button(wxMOUSE_BTN_LEFT))
         m_button = LeftButton;
-    else if (event.RightIsDown())
+    else if (event.Button(wxMOUSE_BTN_RIGHT))
         m_button = RightButton;
-    else if (event.MiddleIsDown())
+    else if (event.Button(wxMOUSE_BTN_MIDDLE))
         m_button = MiddleButton;
+    else if (!m_eventType == MouseEventMoved)
+        ASSERT_NOT_REACHED();
+
+
+    if (m_eventType == MouseEventMoved)
+        m_clickCount = 0;
+    else
+        m_clickCount = event.ButtonDClick() ? 2 : 1;
+
+    m_timestamp = WebCore::currentTime();
 }