jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3810 from RytoEX/qt-midbutton

Browse Source 
UI: Use Qt::MiddleButton instead of deprecated Qt::MidButton
This commit is contained in:
Joel Bethke 2020-12-01 10:31:11 -06:00 committed by GitHub
commit 96da863fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/hotkey-edit.cpp
View File

@ -101,7 +101,7 @@ void OBSHotkeyEdit::mousePressEvent(QMouseEvent *event)
case Qt::MouseButtonMask: case Qt::MouseButtonMask:
return; return;
case Qt::MidButton: case Qt::MiddleButton:
new_key.key = OBS_KEY_MOUSE3; new_key.key = OBS_KEY_MOUSE3;
break; break;

2
UI/obs-app.cpp
View File

@ -116,7 +116,7 @@ QObject *CreateShortcutFilter()
case Qt::MouseButtonMask: case Qt::MouseButtonMask:
return false; return false;
case Qt::MidButton: case Qt::MiddleButton:
hotkey.key = OBS_KEY_MOUSE3; hotkey.key = OBS_KEY_MOUSE3;
break; break;

2
UI/slider-absoluteset-style.cpp
View File

@ -15,6 +15,6 @@ int SliderAbsoluteSetStyle::styleHint(QStyle::StyleHint hint,
QStyleHintReturn *returnData = 0) const QStyleHintReturn *returnData = 0) const
{ {
if (hint == QStyle::SH_Slider_AbsoluteSetButtons) if (hint == QStyle::SH_Slider_AbsoluteSetButtons)
return (Qt::LeftButton | Qt::MidButton); return (Qt::LeftButton | Qt::MiddleButton);
return QProxyStyle::styleHint(hint, option, widget, returnData); return QProxyStyle::styleHint(hint, option, widget, returnData);
} }