mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

Rename Window::Controller to Window::SessionController.

Browse Source
This commit is contained in:
John Preston
2019-06-06 13:21:40 +03:00
parent 263bbf1788
commit a547f80ae9
123 changed files with 445 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -43,7 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_theme_warning.h"
#include "window/window_lock_widgets.h"
#include "window/window_main_menu.h"
#include "window/window_controller.h"
#include "window/window_session_controller.h"
namespace {
@@ -235,7 +235,7 @@ void MainWindow::setupMain() {
clearWidgets();
_main.create(bodyWidget(), controller());
_main.create(bodyWidget(), sessionController());
_main->show();
updateControlsGeometry();
@@ -257,7 +257,7 @@ void MainWindow::showSettings() {
return;
}
if (const auto controller = this->controller()) {
if (const auto controller = sessionController()) {
controller->showSettings();
} else {
showSpecialLayer(Box<Settings::LayerWidget>(), anim::type::normal);
@@ -294,7 +294,7 @@ void MainWindow::showMainMenu() {
if (isHidden()) showFromTray();
ensureLayerCreated();
_layer->showMainMenu(controller(), anim::type::normal);
_layer->showMainMenu(sessionController(), anim::type::normal);
}
void MainWindow::ensureLayerCreated() {
@@ -309,8 +309,8 @@ void MainWindow::ensureLayerCreated() {
destroyLayer();
}, _layer->lifetime());
if (controller()) {
controller()->enableGifPauseReason(Window::GifPauseReason::Layer);
if (const auto controller = sessionController()) {
controller->enableGifPauseReason(Window::GifPauseReason::Layer);
}
}
@@ -324,8 +324,8 @@ void MainWindow::destroyLayer() {
setFocus();
}
layer = nullptr;
if (controller()) {
controller()->disableGifPauseReason(Window::GifPauseReason::Layer);
if (const auto controller = sessionController()) {
controller->disableGifPauseReason(Window::GifPauseReason::Layer);
}
if (resetFocus) {
setInnerFocus();
@@ -385,7 +385,7 @@ void MainWindow::ui_showMediaPreview(
return;
}
if (!_mediaPreview) {
_mediaPreview.create(bodyWidget(), controller());
_mediaPreview.create(bodyWidget(), sessionController());
updateControlsGeometry();
}
if (_mediaPreview->isHidden()) {
@@ -401,7 +401,7 @@ void MainWindow::ui_showMediaPreview(
return;
}
if (!_mediaPreview) {
_mediaPreview.create(bodyWidget(), controller());
_mediaPreview.create(bodyWidget(), sessionController());
updateControlsGeometry();
}
if (_mediaPreview->isHidden()) {