From e04598835be5af3ea3699c34a82937dee2d1dff6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 6 Nov 2020 13:52:19 +0400 Subject: [PATCH] Move _monitorRect and _monitorLastGot to psDesktopRect method --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 9 ++------- Telegram/SourceFiles/platform/mac/specific_mac.mm | 9 ++------- Telegram/SourceFiles/platform/win/specific_win.cpp | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 3a833dd78..abad7435b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -947,14 +947,9 @@ Window::ControlsLayout WindowControlsLayout() { } // namespace Platform -namespace { - -QRect _monitorRect; -auto _monitorLastGot = 0LL; - -} // namespace - QRect psDesktopRect() { + static QRect _monitorRect; + static auto _monitorLastGot = 0LL; auto tnow = crl::now(); if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) { _monitorLastGot = tnow; diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm index e856a103d..712e42c93 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm @@ -36,14 +36,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -namespace { - -QRect _monitorRect; -crl::time _monitorLastGot = 0; - -} // namespace - QRect psDesktopRect() { + static QRect _monitorRect; + static crl::time _monitorLastGot = 0; auto tnow = crl::now(); if (tnow > _monitorLastGot + 1000 || tnow < _monitorLastGot) { _monitorLastGot = tnow; diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index fc0b9957f..ad7ee8a2c 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -145,14 +145,9 @@ void psDoCleanup() { } } -namespace { - -QRect _monitorRect; -crl::time _monitorLastGot = 0; - -} // namespace - QRect psDesktopRect() { + static QRect _monitorRect; + static crl::time _monitorLastGot = 0; auto tnow = crl::now(); if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) { _monitorLastGot = tnow;