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

Show third column only when explicitly requested.

Browse Source 
This allows you to show info in layer from mention links.
This commit is contained in:
John Preston
2017-12-04 11:33:33 +04:00
parent 629c216a7f
commit e1c68892d4
23 changed files with 184 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@@ -302,7 +302,7 @@ void WrapWidget::createTopBar() {
_topBar->enableBackButton();
_topBar->backRequest()
| rpl::start_with_next([this] {
showBackFromStack();
_controller->showBackFromStack();
}, _topBar->lifetime());
} else if (wrapValue == Wrap::Side) {
auto close = _topBar->addButton(
@@ -441,19 +441,18 @@ bool WrapWidget::requireTopBarSearch() const {
return false;
}
void WrapWidget::showBackFromStack() {
auto params = Window::SectionShow(
Window::SectionShow::Way::Backward);
bool WrapWidget::showBackFromStackInternal(
const Window::SectionShow &params) {
if (hasStackHistory()) {
auto last = std::move(_historyStack.back());
_historyStack.pop_back();
showNewContent(
last.section.get(),
params);
params.withWay(Window::SectionShow::Way::Backward));
//_anotherTabMemento = std::move(last.anotherTab);
} else if (wrap() != Wrap::Layer) {
_controller->window()->showBackFromStack(params);
return true;
}
return (wrap() == Wrap::Layer);
}
not_null<Ui::RpWidget*> WrapWidget::topWidget() const {
@@ -718,7 +717,7 @@ bool WrapWidget::returnToFirstStackFrame(
&& firstSection.type() == memento->section().type()
&& firstSection.type() == Section::Type::Profile) {
_historyStack.resize(1);
showBackFromStack();
_controller->showBackFromStack();
return true;
}
return false;
@@ -809,7 +808,7 @@ void WrapWidget::resizeEvent(QResizeEvent *e) {
void WrapWidget::keyPressEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Escape) {
if (hasStackHistory() || wrap() != Wrap::Layer) {
showBackFromStack();
_controller->showBackFromStack();
return;
}
}
@@ -840,7 +839,7 @@ object_ptr<Ui::RpWidget> WrapWidget::createTopBarSurrogate(
auto result = object_ptr<Ui::AbstractButton>(parent);
result->addClickHandler([weak = make_weak(this)]{
if (weak) {
weak->showBackFromStack();
weak->_controller->showBackFromStack();
}
});
result->setGeometry(_topBar->geometry());