4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix warnings for Qt 5.15

Browse source 
AllDockWidgetFeatures is now deprecated. Use underlying values instead.

Use default QFlags constructor instead of nullptr/0.

Use QWheelEvent::angleDelta() in place of orientation() and delta(), and
position() in place of x() and y().
This commit is contained in:
jpark37 2020-06-07 15:31:13 -07:00
commit c2ddc428b0
10 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/window-basic-preview.cpp
View file

@ -495,13 +495,15 @@ void OBSBasicPreview::keyReleaseEvent(QKeyEvent *event)
void OBSBasicPreview::wheelEvent(QWheelEvent *event)
{
if (scrollMode && IsFixedScaling() &&
event->orientation() == Qt::Vertical) {
if (event->delta() > 0)
SetScalingLevel(scalingLevel + 1);
else if (event->delta() < 0)
SetScalingLevel(scalingLevel - 1);
emit DisplayResized();
if (scrollMode && IsFixedScaling()) {
const int delta = event->angleDelta().y();
if (delta != 0) {
if (delta > 0)
SetScalingLevel(scalingLevel + 1);
else
SetScalingLevel(scalingLevel - 1);
emit DisplayResized();
}
}
OBSQTDisplay::wheelEvent(event);