From b1ca0f5ea32214b2c33fe1588d7618ea67eb4f2e Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 21 Nov 2016 23:48:21 +0300 Subject: [PATCH] Fixed build for macOS old versions. --- Telegram/SourceFiles/core/build_config.h | 2 +- Telegram/SourceFiles/platform/mac/window_title_mac.mm | 2 -- Telegram/SourceFiles/stickers/emoji_pan.h | 4 ++-- Telegram/SourceFiles/ui/effects/round_checkbox.cpp | 8 ++++++-- Telegram/SourceFiles/window/window_theme.cpp | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/core/build_config.h b/Telegram/SourceFiles/core/build_config.h index 49c89041e..ff80136ea 100644 --- a/Telegram/SourceFiles/core/build_config.h +++ b/Telegram/SourceFiles/core/build_config.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -#include +#include // thanks Chromium diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm index 8d6c84311..2eb2e9216 100644 --- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm +++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm @@ -76,13 +76,11 @@ void TitleWidget::mouseDoubleClickEvent(QMouseEvent *e) { } Window::TitleWidget *CreateTitleWidget(QWidget *parent) { -#ifndef OS_MAC_OLD if (auto window = qobject_cast(parent)) { if (auto height = window->getCustomTitleHeight()) { return new TitleWidget(window, height); } } -#endif // !OS_MAC_OLD return nullptr; } diff --git a/Telegram/SourceFiles/stickers/emoji_pan.h b/Telegram/SourceFiles/stickers/emoji_pan.h index 69a125018..355f91221 100644 --- a/Telegram/SourceFiles/stickers/emoji_pan.h +++ b/Telegram/SourceFiles/stickers/emoji_pan.h @@ -490,6 +490,8 @@ public: void step_icons(uint64 ms, bool timer); + void leaveToChildEvent(QEvent *e, QWidget *child) override; + void stickersInstalled(uint64 setId); void queryInlineBot(UserData *bot, PeerData *peer, QString query); @@ -611,8 +613,6 @@ private: void validateSelectedIcon(ValidateIconAnimations animations); void updateContentHeight(); - void leaveToChildEvent(QEvent *e, QWidget *child); - void updateSelected(); void updateIcons(); diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp index 230c239b3..a059db321 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp @@ -97,6 +97,8 @@ void RoundCheckbox::paint(Painter &p, uint64 ms, int x, int y, int outerWidth, f p.setOpacity(fadeIn * fadeOut); if (fadeOut < 1.) { p.drawPixmapLeft(to, outerWidth, icon.wideCheckCache, cacheFrom); + } else if (fadeIn == 1.) { + p.drawPixmapLeft(to, outerWidth, _wideCheckFullCache, cacheFrom); } else { auto realDivider = ((kWideScale - 1) * _st.size / 2 + qMax(fadeIn - 0.5, 0.) * 2. * _st.size); auto divider = qRound(realDivider * masterScale); @@ -179,9 +181,11 @@ void RoundCheckbox::prepareWideCheckIconCache(Icon *icon) { Painter p(&wideCache); p.setCompositionMode(QPainter::CompositionMode_Source); auto iconSize = kWideScale * _st.size; - auto divider = qRound((kWideScale - 1) * _st.size / 2 + qMax(icon->fadeIn.current(1.) - 0.5, 0.) * 2. * _st.size); + auto realDivider = ((kWideScale - 1) * _st.size / 2 + qMax(icon->fadeIn.current(1.) - 0.5, 0.) * 2. * _st.size); + auto divider = qRound(realDivider); + auto cacheDivider = qRound(realDivider) * cIntRetinaFactor(); p.drawPixmapLeft(QRect(0, 0, divider, iconSize), cacheWidth, _wideCheckFullCache, QRect(0, 0, divider * cIntRetinaFactor(), _wideCheckFullCache.height())); - p.drawPixmapLeft(QRect(divider, 0, iconSize - divider, iconSize), cacheWidth, _wideCheckBgCache, QRect(divider * cIntRetinaFactor(), 0, _wideCheckBgCache.width() - divider * cIntRetinaFactor(), _wideCheckBgCache.height())); + p.drawPixmapLeft(QRect(divider, 0, iconSize - divider, iconSize), cacheWidth, _wideCheckBgCache, QRect(cacheDivider, 0, _wideCheckBgCache.width() - cacheDivider, _wideCheckBgCache.height())); } icon->wideCheckCache = App::pixmapFromImageInPlace(std_::move(wideCache)); icon->wideCheckCache.setDevicePixelRatio(cRetinaFactor()); diff --git a/Telegram/SourceFiles/window/window_theme.cpp b/Telegram/SourceFiles/window/window_theme.cpp index c5b845b72..aa8a2d260 100644 --- a/Telegram/SourceFiles/window/window_theme.cpp +++ b/Telegram/SourceFiles/window/window_theme.cpp @@ -171,7 +171,7 @@ bool loadColorScheme(const QByteArray &content, Instance *out = nullptr) { auto data = base::parse::stripComments(content); auto from = data.constData(), end = from + data.size(); while (from != end) { - QLatin1String name, value; + QLatin1String name(""), value(""); if (!readNameAndValue(from, end, &name, &value)) { return false; }