OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use Qt dialogs for Font & Color Pickers on Linux

Browse source 
This fixes a hang on Ubuntu when closing the
dialogs after leaving them open for a time.
This commit is contained in:
Matt Gajownik 2020-03-28 23:15:25 +11:00
parent 094edda866
commit a9a19cf351
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/properties-view.cpp
View file

@ -1694,7 +1694,7 @@ bool WidgetInfo::ColorChanged(const char *setting)
* other open QDialogs on exit, and
* https://bugreports.qt-project.org/browse/QTBUG-34532
*/
#ifdef __APPLE__
#ifndef _WIN32
options |= QColorDialog::DontUseNativeDialog;
#endif
@ -1728,7 +1728,7 @@ bool WidgetInfo::FontChanged(const char *setting)
QFontDialog::FontDialogOptions options;
#ifdef __APPLE__
#ifndef _WIN32
options = QFontDialog::DontUseNativeDialog;
#endif

2
UI/window-basic-main.cpp
View file

@ -7482,7 +7482,7 @@ void OBSBasic::ColorChange()
obs_data_get_string(curPrivData, "color");
const char *customColor = *oldColor != 0 ? oldColor
: "#55FF0000";
#ifdef __APPLE__
#ifndef _WIN32
options |= QColorDialog::DontUseNativeDialog;
#endif