From 819e3dc41daa39e3bd68b742460eca4adc32d680 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 9 Dec 2016 10:18:30 -0800 Subject: [PATCH] remove some unneeded html special-casing --- .../entities-renderer/src/RenderableWebEntityItem.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index 92ef186821..b48fd4263a 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -150,12 +150,11 @@ bool RenderableWebEntityItem::buildWebSurface(QSharedPointer point.setPos(windowPoint); QList touchPoints; touchPoints.push_back(point); - QTouchEvent* touchEvent = new QTouchEvent(QEvent::TouchEnd, nullptr, Qt::NoModifier, Qt::TouchPointReleased, touchPoints); + QTouchEvent* touchEvent = new QTouchEvent(QEvent::TouchEnd, nullptr, + Qt::NoModifier, Qt::TouchPointReleased, touchPoints); touchEvent->setWindow(_webSurface->getWindow()); touchEvent->setDevice(&_touchDevice); - if (_contentType == htmlContent) { - touchEvent->setTarget(_webSurface->getRootItem()); - } + touchEvent->setTarget(_webSurface->getRootItem()); QCoreApplication::postEvent(_webSurface->getWindow(), touchEvent); } }); @@ -340,9 +339,7 @@ void RenderableWebEntityItem::handlePointerEvent(const PointerEvent& event) { QTouchEvent* touchEvent = new QTouchEvent(type); touchEvent->setWindow(_webSurface->getWindow()); touchEvent->setDevice(&_touchDevice); - if (_contentType == htmlContent) { - touchEvent->setTarget(_webSurface->getRootItem()); - } + touchEvent->setTarget(_webSurface->getRootItem()); touchEvent->setTouchPoints(touchPoints); touchEvent->setTouchPointStates(touchPointState);