mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Removed Adaptive namespace from Window::Controller and MainWidget.

Browse Source
This commit is contained in:
23rd
2021-05-27 02:20:27 +03:00
parent 824fbc21e8
commit 80fe2f57e9
7 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/add_contact_box.h"
#include "boxes/peers/edit_peer_info_box.h"
#include "boxes/peer_list_controllers.h"
#include "window/window_adaptive.h"
#include "window/window_controller.h"
#include "window/main_window.h"
#include "window/window_filters_menu.h"
@@ -802,7 +803,7 @@ bool SessionController::forceWideDialogs() const {
}
auto SessionController::computeColumnLayout() const -> ColumnLayout {
auto layout = Adaptive::WindowLayout::OneColumn;
auto layout = AdaptiveModern::WindowLayout::OneColumn;
auto bodyWidth = widget()->bodyWidget()->width() - filtersWidth();
auto dialogsWidth = 0, chatWidth = 0, thirdWidth = 0;
@@ -831,12 +832,12 @@ auto SessionController::computeColumnLayout() const -> ColumnLayout {
if (useOneColumnLayout()) {
dialogsWidth = chatWidth = bodyWidth;
} else if (useNormalLayout()) {
layout = Adaptive::WindowLayout::Normal;
layout = AdaptiveModern::WindowLayout::Normal;
dialogsWidth = countDialogsWidthFromRatio(bodyWidth);
accumulate_min(dialogsWidth, bodyWidth - st::columnMinimalWidthMain);
chatWidth = bodyWidth - dialogsWidth;
} else {
layout = Adaptive::WindowLayout::ThreeColumn;
layout = AdaptiveModern::WindowLayout::ThreeColumn;
dialogsWidth = countDialogsWidthFromRatio(bodyWidth);
thirdWidth = countThirdColumnWidthFromRatio(bodyWidth);
auto shrink = shrinkDialogsAndThirdColumns(
@@ -906,7 +907,7 @@ bool SessionController::takeThirdSectionFromLayer() {
}
void SessionController::resizeForThirdSection() {
if (Adaptive::ThreeColumn()) {
if (adaptive().isThreeColumn()) {
return;
}
@@ -959,7 +960,7 @@ void SessionController::closeThirdSection() {
auto &settings = Core::App().settings();
auto newWindowSize = widget()->size();
auto layout = computeColumnLayout();
if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) {
if (layout.windowLayout == AdaptiveModern::WindowLayout::ThreeColumn) {
auto noResize = widget()->isFullScreen()
|| widget()->isMaximized();
auto savedValue = settings.thirdSectionExtendedBy();
@@ -1182,7 +1183,7 @@ void SessionController::setActiveChatsFilter(FilterId id) {
if (id) {
closeFolder();
}
if (Adaptive::OneColumn()) {
if (adaptive().isOneColumn()) {
Ui::showChatsList(&session());
}
}