fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-21 00:23:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Follow the scroll direction in swipe gestures.

Browse Source 
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Ilya Fedin
2026-08-27 20:14:32 +04:00
committed by John Preston
parent d99b56b5e0
commit b65cd9496a
8 changed files with 95 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@@ -811,19 +811,27 @@ Widget::Widget(
}
void Widget::setupSwipeBack() {
const auto isMainList = [=] {
// The main menu is dragged out from the left side of the window, so it
// always waits past the end of the chats filters, at whichever of them
// the swipe towards it scrolls to nothing - the first one with the
// natural scrolling and the last one without it. Standing anywhere else
// in the filters that swipe still has a filter to move to.
const auto noNearChatsFilter = [=](bool isNext) {
const auto current = controller()->activeChatsFilterCurrent();
const auto &chatsFilters = session().data().chatsFilters();
if (chatsFilters.has()) {
return chatsFilters.defaultId() == current;
if (!chatsFilters.has()) {
return !current;
}
return !current;
return !Window::CheckAndJumpToNearChatsFilter(
controller(),
isNext,
false);
};
auto update = [=](Ui::Controls::SwipeContextData data) {
data.cursorTop -= _inner->y();
if (data.translation != 0) {
if (data.translation < 0
if (data.visualTranslation() < 0
&& _inner
&& (Core::App().settings().quickDialogAction()
!= Ui::QuickDialogAction::Disabled)) {
@@ -862,7 +870,8 @@ void Widget::setupSwipeBack() {
if (_childListShown.current()) {
return Ui::Controls::SwipeHandlerFinishData();
}
const auto isRightToLeft = data.direction == Qt::RightToLeft;
const auto isRightToLeft = data.fingerDirection() == Qt::RightToLeft;
const auto scrollRightToLeft = data.direction == Qt::RightToLeft;
const auto action = Core::App().settings().quickDialogAction();
const auto isDisabled = action == Ui::QuickDialogAction::Disabled;
if (_inner) {
@@ -936,27 +945,33 @@ void Widget::setupSwipeBack() {
}
});
}
if (isRightToLeft && isMainList()) {
_swipeBackIconMirrored = true;
return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
_swipeBackIconMirrored = false;
_swipeBackData = {};
if (isMainList()) {
showMainMenu();
}
});
}
const auto next = !scrollRightToLeft;
if (session().data().chatsFilters().has() && isDisabled) {
_swipeBackMirrored = !isRightToLeft;
using namespace Window;
const auto next = !isRightToLeft;
if (CheckAndJumpToNearChatsFilter(controller(), next, false)) {
_swipeBackMirrored = !scrollRightToLeft;
return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
_swipeBackData = {};
CheckAndJumpToNearChatsFilter(controller(), next, true);
});
}
}
// With a quick action other than moving between the chats filters the
// swipe never moves between them at all, so the main menu is not
// waiting past their end - it is dragged out from any of them.
const auto mainMenuHere = [=] {
return !isDisabled || noNearChatsFilter(next);
};
if (isRightToLeft && mainMenuHere()) {
_swipeBackIconMirrored = true;
return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
_swipeBackIconMirrored = false;
_swipeBackData = {};
if (mainMenuHere()) {
showMainMenu();
}
});
}
return Ui::Controls::SwipeHandlerFinishData();
};