History

more work on dragging in hmd

Brad Hefta-Gaub committed 10 years ago

Commit c4fc3e41 parent 279519b3 files · +13 −23Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+7−7
@@ -1743,7 +1743,7 @@ bool Application::event(QEvent* event) { · 1742 unmodified lines
1743 1743
1744 switch (event->type()) {1744 switch (event->type()) {
1745 case QEvent::MouseMove:1745 case QEvent::MouseMove:
1746 qDebug() << __FUNCTION__ << "(QEvent::MouseMove)... line:" << __LINE__;1746 //qDebug() << __FUNCTION__ << "(QEvent::MouseMove)... line:" << __LINE__;
1747 mouseMoveEvent((QMouseEvent*)event);1747 mouseMoveEvent((QMouseEvent*)event);
1748 return true;1748 return true;
1749 case QEvent::MouseButtonPress:1749 case QEvent::MouseButtonPress:
@@ -1781,7 +1781,7 @@ bool Application::event(QEvent* event) { · 31 unmodified lines
1781 dropEvent(static_cast<QDropEvent*>(event));1781 dropEvent(static_cast<QDropEvent*>(event));
1782 return true;1782 return true;
1783 case QEvent::Leave:1783 case QEvent::Leave:
1784 qDebug() << __FUNCTION__ << "().... QEvent::Leave";1784 //qDebug() << __FUNCTION__ << "().... QEvent::Leave";
1785 break; // fall through1785 break; // fall through
1786 default:1786 default:
1787 break;1787 break;
@@ -1813,7 +1813,7 @@ bool Application::event(QEvent* event) { · 25 unmodified lines
1813bool Application::eventFilter(QObject* object, QEvent* event) {1813bool Application::eventFilter(QObject* object, QEvent* event) {
1814 1814
1815 if (event->type() == QEvent::Leave) {1815 if (event->type() == QEvent::Leave) {
1816 qDebug() << __FUNCTION__ << "().... QEvent::Leave";1816 //qDebug() << __FUNCTION__ << "().... QEvent::Leave";
1817 _compositor.handleLeaveEvent();1817 _compositor.handleLeaveEvent();
1818 }1818 }
1819 1819
@@ -2204,7 +2204,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) { · 384 unmodified lines
2204 if (_aboutToQuit) {2204 if (_aboutToQuit) {
2205 return;2205 return;
2206 }2206 }
2207 qDebug() << __FUNCTION__ << "line:" << __LINE__ << "event:" << event << "_fakedMouseEvent:" << _fakedMouseEvent;2207 //qDebug() << __FUNCTION__ << "line:" << __LINE__ << "event:" << event << "_fakedMouseEvent:" << _fakedMouseEvent;
2208 2208
2209 maybeToggleMenuVisible(event);2209 maybeToggleMenuVisible(event);
2210 2210
@@ -2261,13 +2261,13 @@ void Application::mousePressEvent(QMouseEvent* event) { · 50 unmodified lines
2261 // keyboard shortcuts not to be swallowed by them. In particular, WebEngineViews2261 // keyboard shortcuts not to be swallowed by them. In particular, WebEngineViews
2262 // will consume all keyboard events.2262 // will consume all keyboard events.
2263 offscreenUi->unfocusWindows();2263 offscreenUi->unfocusWindows();
2264 qDebug() << __FUNCTION__ << "event:" << event;2264 //qDebug() << __FUNCTION__ << "event:" << event;
2265 2265
2266 auto eventPosition = _compositor.getMouseEventPosition(event);2266 auto eventPosition = _compositor.getMouseEventPosition(event);
2267 QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition, _glWidget);2267 QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition, _glWidget);
2268 2268
2269 qDebug() << __FUNCTION__ << " eventPosition:" << eventPosition;2269 //qDebug() << __FUNCTION__ << " eventPosition:" << eventPosition;
2270 qDebug() << __FUNCTION__ << "transformedPos:" << transformedPos;2270 //qDebug() << __FUNCTION__ << "transformedPos:" << transformedPos;
2271 2271
2272 QMouseEvent mappedEvent(event->type(),2272 QMouseEvent mappedEvent(event->type(),
2273 transformedPos,2273 transformedPos,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t