diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp index 08a12fc7d..b4fec27de 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp @@ -68,7 +68,7 @@ QImage EmojiImageLoader::prepare(EmojiPtr emoji) const { { -1, 1 }, { 1, 1 }, } }; - const auto corrected = int(base::SafeRound(delta / sqrt(2.))); + const auto corrected = int(base::SafeRound(delta / M_SQRT2)); for (const auto &shift : diagonal) { for (auto i = 0; i != corrected; ++i) { p.drawImage(QPoint(delta, delta) + shift * (i + 1), tinted); diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp index a59e536c5..c646727c0 100644 --- a/Telegram/SourceFiles/media/player/media_player_button.cpp +++ b/Telegram/SourceFiles/media/player/media_player_button.cpp @@ -138,8 +138,6 @@ void PlayButtonLayout::paintPlayToPause(QPainter &p, const QBrush &brush, float6 } void PlayButtonLayout::paintPlayToCancel(QPainter &p, const QBrush &brush, float64 progress) { - static const auto sqrt2 = sqrt(2.); - auto playLeft = 0. + _st.playPosition.x(); auto playTop = 0. + _st.playPosition.y(); auto playWidth = _st.playOuter.width() - 2 * playLeft; @@ -149,7 +147,7 @@ void PlayButtonLayout::paintPlayToCancel(QPainter &p, const QBrush &brush, float auto cancelTop = 0. + _st.cancelPosition.y(); auto cancelWidth = _st.cancelOuter.width() - 2 * cancelLeft; auto cancelHeight = _st.cancelOuter.height() - 2 * cancelTop; - auto cancelStroke = (0. + _st.cancelStroke) / sqrt2; + auto cancelStroke = (0. + _st.cancelStroke) / M_SQRT2; p.setPen(Qt::NoPen); PainterHighQualityEnabler hq(p); @@ -186,8 +184,6 @@ void PlayButtonLayout::paintPlayToCancel(QPainter &p, const QBrush &brush, float } void PlayButtonLayout::paintPauseToCancel(QPainter &p, const QBrush &brush, float64 progress) { - static const auto sqrt2 = sqrt(2.); - auto pauseLeft = 0. + _st.pausePosition.x(); auto pauseTop = 0. + _st.pausePosition.y(); auto pauseWidth = _st.pauseOuter.width() - 2 * pauseLeft; @@ -198,7 +194,7 @@ void PlayButtonLayout::paintPauseToCancel(QPainter &p, const QBrush &brush, floa auto cancelTop = 0. + _st.cancelPosition.y(); auto cancelWidth = _st.cancelOuter.width() - 2 * cancelLeft; auto cancelHeight = _st.cancelOuter.height() - 2 * cancelTop; - auto cancelStroke = (0. + _st.cancelStroke) / sqrt2; + auto cancelStroke = (0. + _st.cancelStroke) / M_SQRT2; p.setPen(Qt::NoPen); PainterHighQualityEnabler hq(p); diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 1b2cb3838..868d3690b 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -272,8 +272,7 @@ void MainMenu::ToggleAccountsButton::paintEvent(QPaintEvent *e) { const auto y = 0. + height() - st::mainMenuTogglePosition.y(); const auto size = st::mainMenuToggleSize; const auto size2 = size / 2.; - const auto sqrt2 = sqrt(2.); - const auto stroke = (st::mainMenuToggleFourStrokes / 4.) / sqrt2; + const auto stroke = (st::mainMenuToggleFourStrokes / 4.) / M_SQRT2; const auto left = x - size; const auto right = x + size; const auto bottom = y + size2; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 6e3cc8c76..28d01d023 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 6e3cc8c769fcc424e2e798ca90847bf6d89688d0 +Subproject commit 28d01d023bd76310520a895bdb7f66a2e70a2043