|
@@ -56,31 +56,6 @@ namespace {
|
|
|
const float kDefaultScaleFactor = 1.0;
|
|
|
|
|
|
ui::MouseEvent UiMouseEventFromWebMouseEvent(blink::WebMouseEvent event) {
|
|
|
- ui::EventType type = ui::EventType::kUnknown;
|
|
|
- switch (event.GetType()) {
|
|
|
- case blink::WebInputEvent::Type::kMouseDown:
|
|
|
- type = ui::EventType::kMousePressed;
|
|
|
- break;
|
|
|
- case blink::WebInputEvent::Type::kMouseUp:
|
|
|
- type = ui::EventType::kMouseReleased;
|
|
|
- break;
|
|
|
- case blink::WebInputEvent::Type::kMouseMove:
|
|
|
- type = ui::EventType::kMouseMoved;
|
|
|
- break;
|
|
|
- case blink::WebInputEvent::Type::kMouseEnter:
|
|
|
- type = ui::EventType::kMouseEntered;
|
|
|
- break;
|
|
|
- case blink::WebInputEvent::Type::kMouseLeave:
|
|
|
- type = ui::EventType::kMouseExited;
|
|
|
- break;
|
|
|
- case blink::WebInputEvent::Type::kMouseWheel:
|
|
|
- type = ui::EventType::kMousewheel;
|
|
|
- break;
|
|
|
- default:
|
|
|
- type = ui::EventType::kUnknown;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
int button_flags = 0;
|
|
|
switch (event.button) {
|
|
|
case blink::WebMouseEvent::Button::kBack:
|
|
@@ -103,12 +78,12 @@ ui::MouseEvent UiMouseEventFromWebMouseEvent(blink::WebMouseEvent event) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- ui::MouseEvent ui_event(type,
|
|
|
- gfx::Point(std::floor(event.PositionInWidget().x()),
|
|
|
- std::floor(event.PositionInWidget().y())),
|
|
|
- gfx::Point(std::floor(event.PositionInWidget().x()),
|
|
|
- std::floor(event.PositionInWidget().y())),
|
|
|
- ui::EventTimeForNow(), button_flags, button_flags);
|
|
|
+ ui::MouseEvent ui_event{event.GetTypeAsUiEventType(),
|
|
|
+ event.PositionInWidget(),
|
|
|
+ event.PositionInWidget(),
|
|
|
+ ui::EventTimeForNow(),
|
|
|
+ button_flags,
|
|
|
+ button_flags};
|
|
|
ui_event.SetClickCount(event.click_count);
|
|
|
|
|
|
return ui_event;
|