mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Merge tag 'v4.10.0' into dev
# Conflicts: # README.md # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/apiwrap.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/data/data_stories.cpp # Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
*/
|
||||
#include "dialogs/dialogs_widget.h"
|
||||
|
||||
#include "base/options.h"
|
||||
#include "dialogs/ui/dialogs_stories_content.h"
|
||||
#include "dialogs/ui/dialogs_stories_list.h"
|
||||
#include "dialogs/dialogs_inner_widget.h"
|
||||
@@ -22,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "boxes/peers/edit_peer_requests_box.h"
|
||||
#include "ui/widgets/buttons.h"
|
||||
#include "ui/widgets/elastic_scroll.h"
|
||||
#include "ui/widgets/input_fields.h"
|
||||
#include "ui/widgets/fields/input_field.h"
|
||||
#include "ui/wrap/fade_wrap.h"
|
||||
#include "ui/effects/radial_animation.h"
|
||||
#include "ui/chat/requests_bar.h"
|
||||
@@ -78,6 +79,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
#include <QtCore/QMimeData>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtWidgets/QTextEdit>
|
||||
|
||||
// AyuGram includes
|
||||
#include "ayu/ayu_settings.h"
|
||||
@@ -89,8 +91,16 @@ namespace {
|
||||
constexpr auto kSearchPerPage = 50;
|
||||
constexpr auto kStoriesExpandDuration = crl::time(200);
|
||||
|
||||
base::options::toggle OptionForumHideChatsList({
|
||||
.id = kOptionForumHideChatsList,
|
||||
.name = "Hide chats list in forums",
|
||||
.description = "Don't keep a narrow column of chats list.",
|
||||
});
|
||||
|
||||
} // namespace
|
||||
|
||||
const char kOptionForumHideChatsList[] = "forum-hide-chats-list";
|
||||
|
||||
class Widget::BottomButton : public Ui::RippleButton {
|
||||
public:
|
||||
BottomButton(
|
||||
@@ -344,12 +354,12 @@ Widget::Widget(
|
||||
Ui::PostponeCall(this, [=] { listScrollUpdated(); });
|
||||
}, lifetime());
|
||||
|
||||
QObject::connect(_filter, &Ui::InputField::changed, [=] {
|
||||
_filter->changes(
|
||||
) | rpl::start_with_next([=] {
|
||||
applyFilterUpdate();
|
||||
});
|
||||
QObject::connect(_filter, &Ui::InputField::submitted, [=] {
|
||||
submit();
|
||||
});
|
||||
}, _filter->lifetime());
|
||||
_filter->submits(
|
||||
) | rpl::start_with_next([=] { submit(); }, _filter->lifetime());
|
||||
QObject::connect(
|
||||
_filter->rawTextEdit().get(),
|
||||
&QTextEdit::cursorPositionChanged,
|
||||
@@ -2411,7 +2421,8 @@ void Widget::showForum(
|
||||
const Window::SectionShow ¶ms) {
|
||||
if (!params.childColumn
|
||||
|| !Core::App().settings().dialogsWidthRatio()
|
||||
|| (_layout != Layout::Main)) {
|
||||
|| (_layout != Layout::Main)
|
||||
|| OptionForumHideChatsList.value()) {
|
||||
changeOpenedForum(forum, params.animated);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user