void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 07:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Adaptive namespace from Settings::Chat.

Browse source
This commit is contained in:
23rd 2021-05-27 02:20:00 +03:00
parent 295a863d69
commit 9b488f03a1
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/settings/settings_chat.cpp
View file

@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_themes_embedded.h" #include "window/themes/window_themes_embedded.h"
#include "window/themes/window_theme_editor_box.h" #include "window/themes/window_theme_editor_box.h"
#include "window/themes/window_themes_cloud_list.h" #include "window/themes/window_themes_cloud_list.h"
#include "window/window_adaptive.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
@ -967,19 +968,15 @@ void SetupChatBackground(
tile->setChecked(tiled); tile->setChecked(tiled);
}, tile->lifetime()); }, tile->lifetime());
adaptive->toggleOn(rpl::single( adaptive->toggleOn(controller->adaptive().chatLayoutValue(
rpl::empty_value() ) | rpl::map([](Window::AdaptiveModern::ChatLayout layout) {
) | rpl::then(base::ObservableViewer( return (layout == Window::AdaptiveModern::ChatLayout::Wide);
Adaptive::Changed()
)) | rpl::map([] {
return (Global::AdaptiveChatLayout() == Adaptive::ChatLayout::Wide);
})); }));
adaptive->entity()->checkedChanges( adaptive->entity()->checkedChanges(
) | rpl::start_with_next([=](bool checked) { ) | rpl::start_with_next([=](bool checked) {
Core::App().settings().setAdaptiveForWide(checked); Core::App().settings().setAdaptiveForWide(checked);
Core::App().saveSettingsDelayed(); Core::App().saveSettingsDelayed();
Adaptive::Changed().notify();
}, adaptive->lifetime()); }, adaptive->lifetime());
} }

4
Telegram/SourceFiles/window/window_adaptive.cpp
View file

@ -36,6 +36,10 @@ rpl::producer<bool> AdaptiveModern::oneColumnValue() const {
}); });
} }
rpl::producer<AdaptiveModern::ChatLayout> AdaptiveModern::chatLayoutValue() const {
return _chatLayout.value();
}
bool AdaptiveModern::isOneColumn() const { bool AdaptiveModern::isOneColumn() const {
return _layout.current() == WindowLayout::OneColumn; return _layout.current() == WindowLayout::OneColumn;
} }

1
Telegram/SourceFiles/window/window_adaptive.h
View file

@ -29,6 +29,7 @@ public:
[[nodiscard]] rpl::producer<> changed() const; [[nodiscard]] rpl::producer<> changed() const;
[[nodiscard]] rpl::producer<bool> oneColumnValue() const; [[nodiscard]] rpl::producer<bool> oneColumnValue() const;
[[nodiscard]] rpl::producer<ChatLayout> chatLayoutValue() const;
[[nodiscard]] bool isOneColumn() const; [[nodiscard]] bool isOneColumn() const;
[[nodiscard]] bool isNormal() const; [[nodiscard]] bool isNormal() const;