FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-04 11:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.12.2' into dev

Browse Source 
# Conflicts:
#	.github/workflows/win.yml
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/settings/settings_advanced.cpp
#	Telegram/SourceFiles/settings/settings_main.cpp
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
ZavaruKitsu
2023-12-01 15:38:13 +03:00
parent 6af28f6089 cb3dece478
commit 0f8187fa36
556 changed files with 27811 additions and 3566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/window/window_session_controller.cpp
+9 -15
View File
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peers/edit_peer_info_box.h"
#include "boxes/peers/replace_boost_box.h"
#include "boxes/delete_messages_box.h"
#include "window/window_adaptive.h"
#include "window/window_controller.h"
#include "window/window_filters_menu.h"
#include "info/info_memento.h"
@@ -27,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_instance.h"
#include "media/view/media_view_open_common.h"
#include "data/data_document_resolver.h"
#include "data/data_media_types.h"
#include "data/data_session.h"
#include "data/data_file_origin.h"
#include "data/data_folder.h"
@@ -43,23 +41,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_chat_filters.h"
#include "data/data_replies_list.h"
#include "data/data_peer_values.h"
#include "data/data_stories.h"
#include "passport/passport_form_controller.h"
#include "chat_helpers/tabbed_selector.h"
#include "chat_helpers/emoji_interactions.h"
#include "core/shortcuts.h"
#include "core/application.h"
#include "core/core_settings.h"
#include "core/click_handler_types.h"
#include "base/unixtime.h"
#include "ui/controls/userpic_button.h"
#include "ui/layers/generic_box.h"
#include "ui/text/text_utilities.h"
#include "ui/text/format_values.h" // Ui::FormatPhone.
#include "ui/delayed_activation.h"
#include "ui/boxes/boost_box.h"
#include "ui/chat/attach/attach_bot_webview.h"
#include "ui/chat/chat_style.h"
#include "ui/chat/chat_theme.h"
#include "ui/effects/message_sending_animation_controller.h"
#include "ui/style/style_palette_colorizer.h"
@@ -69,11 +62,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/boxes/calendar_box.h"
#include "ui/boxes/confirm_box.h"
#include "mainwidget.h"
#include "mainwindow.h"
#include "main/main_account.h"
#include "main/main_domain.h"
#include "main/main_session.h"
#include "main/main_session_settings.h"
#include "lang/lang_keys.h"
#include "apiwrap.h"
#include "api/api_chat_invite.h"
#include "api/api_global_privacy.h"
@@ -82,13 +75,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/file_upload.h"
#include "window/themes/window_theme.h"
#include "window/window_peer_menu.h"
#include "window/window_session_controller_link_info.h"
#include "settings/settings_main.h"
#include "settings/settings_premium.h"
#include "settings/settings_privacy_security.h"
#include "styles/style_window.h"
#include "styles/style_dialogs.h"
#include "styles/style_layers.h" // st::boxLabel
#include "styles/style_premium.h"
// AyuGram includes
#include "ayu/ayu_settings.h"
@@ -809,7 +802,8 @@ void SessionNavigation::showRepliesForMessage(
history,
rootId,
commentId,
params.highlightPart);
params.highlightPart,
params.highlightPartOffsetHint);
memento->setFromTopic(topic);
showSection(std::move(memento), params);
return;
@@ -2072,11 +2066,11 @@ void SessionController::clearPassportForm() {
void SessionController::showChooseReportMessages(
not_null<PeerData*> peer,
Ui::ReportReason reason,
Fn<void(MessageIdsList)> done) {
Fn<void(MessageIdsList)> done) const {
content()->showChooseReportMessages(peer, reason, std::move(done));
}
void SessionController::clearChooseReportMessages() {
void SessionController::clearChooseReportMessages() const {
content()->clearChooseReportMessages();
}
@@ -2109,7 +2103,7 @@ void SessionController::showInNewWindow(
void SessionController::toggleChooseChatTheme(
not_null<PeerData*> peer,
std::optional<bool> show) {
std::optional<bool> show) const {
content()->toggleChooseChatTheme(peer, show);
}
@@ -2125,7 +2119,7 @@ void SessionController::finishChatThemeEdit(not_null<PeerData*> peer) {
}
}
void SessionController::updateColumnLayout() {
void SessionController::updateColumnLayout() const {
content()->updateColumnLayout();
}
@@ -2743,7 +2737,7 @@ QString SessionController::premiumRef() const {
return _premiumRef;
}
bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) {
bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) const {
return widget()->contentOverlapped(w, e);
}