OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-04 10:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use native combobox popup on macOS

Browse source 
As recommended by Qt on QTBUG-106162, this fixes QComboBox popups not
working with VoiceOver.
This commit is contained in:
gxalpha 2023-01-27 16:41:53 +01:00 committed by Patrick Heyer
parent cd78ecae50
commit 2272efc91f
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/obs-app.cpp
View file

@ -1249,7 +1249,7 @@ bool OBSApp::SetTheme(std::string name, std::string path)
bool OBSApp::InitTheme()
{
defaultPalette = palette();
setStyle(new OBSIgnoreWheelProxyStyle());
setStyle(new OBSProxyStyle());
const char *themeName =
config_get_string(globalConfig, "General", "CurrentTheme3");

11
UI/obs-proxy-style.cpp
View file

@ -77,13 +77,16 @@ OBSContextBarProxyStyle::generatedIconPixmap(QIcon::Mode iconMode,
return QProxyStyle::generatedIconPixmap(iconMode, pixmap, option);
}
int OBSIgnoreWheelProxyStyle::styleHint(StyleHint hint,
const QStyleOption *option,
const QWidget *widget,
QStyleHintReturn *returnData) const
int OBSProxyStyle::styleHint(StyleHint hint, const QStyleOption *option,
const QWidget *widget,
QStyleHintReturn *returnData) const
{
if (hint == SH_ComboBox_AllowWheelScrolling)
return 0;
#ifdef __APPLE__
if (hint == SH_ComboBox_UseNativePopup)
return 1;
#endif
return QProxyStyle::styleHint(hint, option, widget, returnData);
}

4
UI/obs-proxy-style.hpp
View file

@ -2,14 +2,14 @@
#include <QProxyStyle>
class OBSIgnoreWheelProxyStyle : public QProxyStyle {
class OBSProxyStyle : public QProxyStyle {
public:
int styleHint(StyleHint hint, const QStyleOption *option,
const QWidget *widget,
QStyleHintReturn *returnData) const override;
};
class OBSContextBarProxyStyle : public OBSIgnoreWheelProxyStyle {
class OBSContextBarProxyStyle : public OBSProxyStyle {
public:
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *option) const override;