diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index d0964a0f54..9b1a235e93 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -339,9 +339,6 @@ namespace internal { struct Data { bool ScreenIsLocked = false; - Adaptive::WindowLayout AdaptiveWindowLayout = Adaptive::WindowLayout::Normal; - Adaptive::ChatLayout AdaptiveChatLayout = Adaptive::ChatLayout::Normal; - base::Observable AdaptiveChanged; bool TryIPv6 = !Platform::IsWindows(); std::vector ProxiesList; @@ -374,9 +371,6 @@ void finish() { } DefineVar(Global, bool, ScreenIsLocked); -DefineVar(Global, Adaptive::WindowLayout, AdaptiveWindowLayout); -DefineVar(Global, Adaptive::ChatLayout, AdaptiveChatLayout); -DefineRefVar(Global, base::Observable, AdaptiveChanged); DefineVar(Global, bool, TryIPv6); DefineVar(Global, std::vector, ProxiesList); diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index a2648eabd6..f88b7b17b8 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -89,21 +89,6 @@ bool switchInlineBotButtonReceived( #define DeclareVar(Type, Name) DeclareRefVar(Type, Name) \ void Set##Name(const Type &Name); -namespace Adaptive { - -enum class WindowLayout { - OneColumn, - Normal, - ThreeColumn, -}; - -enum class ChatLayout { - Normal, - Wide, -}; - -} // namespace Adaptive - namespace Global { bool started(); @@ -111,9 +96,6 @@ void start(); void finish(); DeclareVar(bool, ScreenIsLocked); -DeclareVar(Adaptive::ChatLayout, AdaptiveChatLayout); -DeclareVar(Adaptive::WindowLayout, AdaptiveWindowLayout); -DeclareRefVar(base::Observable, AdaptiveChanged); DeclareVar(bool, TryIPv6); DeclareVar(std::vector, ProxiesList); @@ -125,23 +107,3 @@ DeclareRefVar(base::Observable, ConnectionTypeChanged); DeclareRefVar(base::Variable, WorkMode); } // namespace Global - -namespace Adaptive { - -inline base::Observable &Changed() { - return Global::RefAdaptiveChanged(); -} - -inline bool OneColumn() { - return Global::AdaptiveWindowLayout() == WindowLayout::OneColumn; -} - -inline bool Normal() { - return Global::AdaptiveWindowLayout() == WindowLayout::Normal; -} - -inline bool ThreeColumn() { - return Global::AdaptiveWindowLayout() == WindowLayout::ThreeColumn; -} - -} // namespace Adaptive