mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-03 16:05:57 +00:00
Code Issues Releases Wiki Activity

Remove Qt MOC dependency for tabbed selector.

Browse Source
This commit is contained in:
John Preston
2018-11-21 22:14:48 +04:00
parent 9f5b09c263
commit ef4f0168f8
22 changed files with 552 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
View File

@@ -66,24 +66,31 @@ TabbedPanel::TabbedPanel(
_hideTimer.setCallback([this] { hideByTimerOrLeave(); });
connect(_selector, &TabbedSelector::checkForHide, this, [this] {
_selector->checkForHide(
) | rpl::start_with_next([=] {
if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
_hideTimer.callOnce(kDelayedHideTimeoutMs);
}
});
connect(_selector, &TabbedSelector::cancelled, this, [this] {
}, lifetime());
_selector->cancelled(
) | rpl::start_with_next([=] {
hideAnimated();
});
connect(_selector, &TabbedSelector::slideFinished, this, [this] {
InvokeQueued(this, [this] {
}, lifetime());
_selector->slideFinished(
) | rpl::start_with_next([=] {
InvokeQueued(this, [=] {
if (_hideAfterSlide) {
startOpacityAnimation(true);
}
});
});
}, lifetime());
if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
connect(App::wnd()->windowHandle(), SIGNAL(activeChanged()), this, SLOT(onWndActiveChanged()));
connect(App::wnd()->windowHandle(), &QWindow::activeChanged, this, [=] {
windowActiveChanged();
});
}
setAttribute(Qt::WA_OpaquePaintEvent, false);
@@ -122,7 +129,7 @@ void TabbedPanel::updateContentHeight() {
update();
}
void TabbedPanel::onWndActiveChanged() {
void TabbedPanel::windowActiveChanged() {
if (!App::wnd()->windowHandle()->isActive() && !isHidden() && !preventAutoHide()) {
hideAnimated();
}