diff --git a/ui/ph.h b/ui/ph.h index c591e8c..2df9fd6 100644 --- a/ui/ph.h +++ b/ui/ph.h @@ -49,7 +49,7 @@ using phrase_value_array = std::array< std::pair, rpl::producer>, Count>; -template +template void set_values(phrase_value_array &&data) { for (auto &[single, value] : data) { single->value = std::move(value); diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp index 871a988..6f765f7 100644 --- a/ui/style/style_core_font.cpp +++ b/ui/style/style_core_font.cpp @@ -14,6 +14,17 @@ #include #include +void style_InitFontsResource() { + Q_INIT_RESOURCE(fonts); +#ifdef Q_OS_WIN + Q_INIT_RESOURCE(win); +#elif defined Q_OS_MAC // Q_OS_WIN + Q_INIT_RESOURCE(mac); +#else // Q_OS_WIN || Q_OS_MAC + Q_INIT_RESOURCE(linux); +#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_LINUX +} + namespace style { namespace internal { namespace { @@ -83,6 +94,8 @@ void StartFonts() { } Started = true; + style_InitFontsResource(); + auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans"); auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold); auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold");