spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[qt] Don't use deprecated features

pull/774/head
Hleb Valoshka 2020-06-16 18:35:31 +03:00
parent 9a91bfebdb
commit 5124962d07
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/celestia/qt/qtglwidget.cpp
View File

@ -272,11 +272,15 @@ void CelestiaGlWidget::mouseReleaseEvent( QMouseEvent* m )
void CelestiaGlWidget::wheelEvent( QWheelEvent* w )
{
if (w->delta() > 0 )
QPoint numDegrees = w->angleDelta();
if (numDegrees.isNull() || numDegrees.y() == 0)
return;
if (numDegrees.y() > 0 )
{
appCore->mouseWheel(-1.0f, 0);
}
else if (w->delta() < 0)
else
{
appCore->mouseWheel(1.0f, 0);
}

2
src/celestia/qt/qtsolarsystembrowser.cpp
View File

@ -526,7 +526,7 @@ QModelIndex SolarSystemTreeModel::parent(const QModelIndex& index) const
Qt::ItemFlags SolarSystemTreeModel::flags(const QModelIndex& index) const
{
if (!index.isValid())
return 0;
return {};
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}

9
src/tools/cmod/cmodview/modelviewwidget.cpp
View File

@ -426,18 +426,17 @@ ModelViewWidget::mouseMoveEvent(QMouseEvent *event)
void
ModelViewWidget::wheelEvent(QWheelEvent* event)
{
if (event->orientation() != Qt::Vertical)
{
QPoint numDegrees = event->angleDelta();
if (numDegrees.isNull() || numDegrees.y() == 0)
return;
}
// Mouse wheel controls camera dolly
#if LINEAR_DOLLY
double adjust = m_modelBoundingRadius * event->delta() / 1000.0;
double adjust = m_modelBoundingRadius * numDegrees.y() / 1000.0;
double newDistance = m_cameraPosition.norm() + adjust;
m_cameraPosition = m_cameraPosition.normalized() * newDistance;
#else
double adjust = std::pow(2.0, event->delta() / 1000.0);
double adjust = std::pow(2.0, numDegrees.y() / 1000.0);
double newDistance = m_cameraPosition.norm() * adjust;
m_cameraPosition = m_cameraPosition.normalized() * newDistance;
#endif