blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 07:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add cursor position (screen coordinates) to mouse picking

Browse source
This commit is contained in:
Dan Paulat 2023-09-08 22:57:30 -05:00
parent f158c4174c
commit 9ebc859756
13 changed files with 55 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -70,7 +70,6 @@ public:
autoRefreshEnabled_ {true},
autoUpdateEnabled_ {true},
selectedLevel2Product_ {common::Level2Product::Unknown},
lastPos_(),
currentStyleIndex_ {0},
currentStyle_ {nullptr},
frameDraws_(0),
@ -174,7 +173,8 @@ public:
common::Level2Product selectedLevel2Product_;
bool hasMouse_ {false};
QPointF lastPos_;
QPointF lastPos_ {};
QPointF lastGlobalPos_ {};
std::size_t currentStyleIndex_;
const MapStyle* currentStyle_;
std::string initialStyleName_ {};
@ -898,7 +898,8 @@ void MapWidget::keyPressEvent(QKeyEvent* ev)
void MapWidget::mousePressEvent(QMouseEvent* ev)
{
p->lastPos_ = ev->position();
p->lastPos_ = ev->position();
p->lastGlobalPos_ = ev->globalPosition();
if (ev->type() == QEvent::MouseButtonPress)
{
@ -944,7 +945,8 @@ void MapWidget::mouseMoveEvent(QMouseEvent* ev)
}
}
p->lastPos_ = ev->position();
p->lastPos_ = ev->position();
p->lastGlobalPos_ = ev->globalPosition();
ev->accept();
}
@ -1064,7 +1066,8 @@ void MapWidgetImpl::RunMousePicking()
++it)
{
// Run mouse picking for each layer
if ((*it)->RunMousePicking(params, mouseScreenCoordinate))
if ((*it)->RunMousePicking(
params, lastPos_, lastGlobalPos_, mouseScreenCoordinate))
{
// If a draw item was picked, don't process additional layers
break;