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

Layers show/hide rewritten, animated show over mainmenu and settings.

Browse Source
This commit is contained in:
John Preston
2016-11-18 16:34:58 +03:00
parent d0f7c6c210
commit 31a66d66e2
54 changed files with 584 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -421,7 +421,7 @@ void MainWindow::showMainMenu() {
void MainWindow::ui_hideSettingsAndLayer(ShowLayerOptions options) {
if (_layerBg) {
_layerBg->onClose();
_layerBg->hideAll();
}
}
@@ -498,14 +498,14 @@ void MainWindow::ui_showLayer(LayerWidget *box, ShowLayerOptions options) {
_layerBg->showLayer(box);
}
if (options.testFlag(ForceFastShowLayer)) {
_layerBg->showFast();
_layerBg->finishAnimation();
}
} else {
if (_layerBg) {
if (_settings) {
_layerBg->onCloseLayers();
_layerBg->hideLayers();
} else {
_layerBg->onClose();
_layerBg->hideAll();
if (options.testFlag(ForceFastShowLayer)) {
_layerBg.destroyDelayed();
}
@@ -606,6 +606,7 @@ void MainWindow::layerHidden() {
_layerBg.destroyDelayed();
hideMediaview();
setInnerFocus();
checkHistoryActivation();
}
void MainWindow::onReActivate() {
@@ -1469,13 +1470,9 @@ MainWindow::~MainWindow() {
_clearManager->stop();
_clearManager = nullptr;
}
delete _connecting;
delete _mediaView;
delete trayIcon;
delete trayIconMenu;
delete _intro;
delete _main;
delete _settings;
}
PreLaunchWindow *PreLaunchWindowInstance = 0;