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

Merge pull request #1443 from DDRBoxman/fontpicker

Browse Source 
UI: Use QT font picker on OSX
This commit is contained in:
Jim
2018-08-23 15:55:12 -07:00
committed by GitHub
parent 1e7e5b5587 6f71afd527
commit 1e4c3516af
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
UI/properties-view.cpp
View File

@@ -1663,11 +1663,18 @@ bool WidgetInfo::FontChanged(const char *setting)
uint32_t flags;
QFont font;
QFontDialog::FontDialogOptions options;
#ifdef __APPLE__
options = QFontDialog::DontUseNativeDialog;
#endif
if (!font_obj) {
font = QFontDialog::getFont(&success, view);
QFont initial;
font = QFontDialog::getFont(&success, initial, view, "Pick a Font", options);
} else {
MakeQFont(font_obj, font);
font = QFontDialog::getFont(&success, font, view);
font = QFontDialog::getFont(&success, font, view, "Pick a Font", options);
obs_data_release(font_obj);
}