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

Move info between Layer and Narrow wrap.

Browse Source
This commit is contained in:
John Preston
2017-09-15 20:34:41 +03:00
parent 088d23d557
commit f162462111
51 changed files with 758 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -2498,10 +2498,12 @@ void MainWidget::ui_showPeerHistory(quint64 peerId, qint32 showAtMsgId, Ui::Show
return false;
}
}
if (back || way == Ui::ShowWay::Forward) {
return true;
if (_history->isHidden()) {
return (_wideSection != nullptr)
|| (_overview != nullptr)
|| (Adaptive::OneColumn() && !_dialogs->isHidden());
}
if (_history->isHidden() && (_wideSection || _overview || Adaptive::OneColumn())) {
if (back || way == Ui::ShowWay::Forward) {
return true;
}
return false;
@@ -2828,16 +2830,16 @@ void MainWidget::showNewWideSection(Window::SectionMemento &&memento, bool back,
auto sectionTop = getSectionTop();
auto newWideGeometry = QRect(_history->x(), sectionTop, _history->width(), height() - sectionTop);
auto newWideSection = memento.createWidget(this, _controller, newWideGeometry);
auto animatedShow = [this] {
if (_a_show.animating() || App::passcoded()) {
auto animatedShow = [&] {
if (_a_show.animating() || App::passcoded() || memento.instant()) {
return false;
}
if (Adaptive::OneColumn() || isSectionShown()) {
return true;
}
return false;
};
auto animationParams = animatedShow() ? prepareWideSectionAnimation(newWideSection) : Window::SectionSlideParams();
}();
auto animationParams = animatedShow ? prepareWideSectionAnimation(newWideSection) : Window::SectionSlideParams();
setFocus(); // otherwise dialogs widget could be focused.
@@ -2858,6 +2860,7 @@ void MainWidget::showNewWideSection(Window::SectionMemento &&memento, bool back,
_wideSection = nullptr;
}
_wideSection = std::move(newWideSection);
updateControlsGeometry();
_history->finishAnimation();
_history->showHistory(0, 0);
@@ -2875,6 +2878,26 @@ void MainWidget::showNewWideSection(Window::SectionMemento &&memento, bool back,
orderWidgets();
}
void MainWidget::checkWideSectionToLayer() {
if (!_wideSection) {
return;
}
if (auto layer = _wideSection->moveContentToLayer(width())) {
dropWideSection(_wideSection);
_controller->showSpecialLayer(
std::move(layer),
LayerOption::ForceFast);
}
}
void MainWidget::dropWideSection(Window::SectionWidget *widget) {
if (_wideSection != widget) {
return;
}
_wideSection.destroy();
showBackFromStack();
}
bool MainWidget::isSectionShown() const {
return _wideSection || _overview || _history->peer();
}
@@ -3142,7 +3165,7 @@ void MainWidget::showAll() {
if (_hider) _hider->offerPeer(0);
}), base::lambda_guarded(this, [this] {
if (_hider && _forwardConfirm) _hider->offerPeer(0);
})), ForceFastShowLayer);
})), LayerOption::ForceFast);
}
}
if (selectingPeer()) {