diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index f911161a2..ea0921999 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -7086,7 +7086,7 @@ void HistoryWidget::paintEvent(QPaintEvent *e) { HistoryView::ServiceMessagePainter::paintBubble(p, tr.x(), tr.y(), tr.width(), tr.height()); p.setPen(st::msgServiceFg); - p.setFont(st::msgServiceFont->f); + p.setFont(st::msgServiceFont); p.drawTextLeft(tr.left() + st::msgPadding.left(), tr.top() + st::msgServicePadding.top(), width(), tr::lng_willbe_history(tr::now)); } } diff --git a/Telegram/SourceFiles/ui/empty_userpic.cpp b/Telegram/SourceFiles/ui/empty_userpic.cpp index 11a703cf8..634643e66 100644 --- a/Telegram/SourceFiles/ui/empty_userpic.cpp +++ b/Telegram/SourceFiles/ui/empty_userpic.cpp @@ -123,8 +123,7 @@ void EmptyUserpic::paint( x = rtl() ? (outerWidth - x - size) : x; const auto fontsize = (size * 13) / 33; - auto font = st::historyPeerUserpicFont->f; - font.setPixelSize(fontsize); + auto font = style::font(fontsize, st::historyPeerUserpicFont->flags(), st::historyPeerUserpicFont->family()); PainterHighQualityEnabler hq(p); p.setBrush(_color); diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp index 11cf88afe..dad7c56bc 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp @@ -905,8 +905,7 @@ void Generator::paintUserpic(int x, int y, Row::Type type, int index, QString le { Painter p(&image); auto fontsize = (st::dialogsPhotoSize * 13) / 33; - auto font = st::historyPeerUserpicFont->f; - font.setPixelSize(fontsize); + auto font = style::font(fontsize, st::historyPeerUserpicFont->flags(), st::historyPeerUserpicFont->family()); p.setFont(font); p.setBrush(Qt::NoBrush); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index eacf58854..d68deebf8 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit eacf588546baba7599316147c63d1cf0bc038fb6 +Subproject commit d68deebf875664c086bd0f202e11a295ba7ada43