From 6f71afd52756bc417f5d3f1a65a28b90c1671f86 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 22 Aug 2018 21:23:00 -0500 Subject: [PATCH] UI: Use QT font picker on OSX --- UI/properties-view.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index 68edeea11..4a286b6ca 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -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); }