void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Beta version 4.5.4: Fix "Mark-as-read-inactive setting."

Browse source
This commit is contained in:
John Preston 2023-01-10 16:23:47 +04:00
parent 0a3d31a91f
commit f9ca7f4505
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -126,7 +126,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
#include "core/application.h" #include "core/application.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "base/options.h"
#include "base/qthelp_regex.h" #include "base/qthelp_regex.h"
#include "ui/boxes/report_box.h" #include "ui/boxes/report_box.h"
#include "ui/chat/pinned_bar.h" #include "ui/chat/pinned_bar.h"
@ -171,9 +170,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
const char kOptionAutoScrollInactiveChat[] =
"auto-scroll-inactive-chat";
namespace { namespace {
constexpr auto kMessagesPerPageFirst = 30; constexpr auto kMessagesPerPageFirst = 30;

2
Telegram/SourceFiles/history/history_widget.h
View file

@ -103,8 +103,6 @@ class TTLButton;
class BotKeyboard; class BotKeyboard;
class HistoryInner; class HistoryInner;
extern const char kOptionAutoScrollInactiveChat[];
class HistoryWidget final class HistoryWidget final
: public Window::AbstractSectionWidget : public Window::AbstractSectionWidget
, private HistoryView::CornerButtonsDelegate { , private HistoryView::CornerButtonsDelegate {

6
Telegram/SourceFiles/mainwindow.cpp
View file

@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "settings/settings_intro.h" #include "settings/settings_intro.h"
#include "platform/platform_notifications_manager.h" #include "platform/platform_notifications_manager.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "base/options.h"
#include "base/variant.h" #include "base/variant.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
@ -85,6 +86,9 @@ base::options::toggle AutoScrollInactiveChat({
} // namespace } // namespace
const char kOptionAutoScrollInactiveChat[] =
"auto-scroll-inactive-chat";
MainWindow::MainWindow(not_null<Window::Controller*> controller) MainWindow::MainWindow(not_null<Window::Controller*> controller)
: Platform::MainWindow(controller) { : Platform::MainWindow(controller) {
resize(st::windowDefaultWidth, st::windowDefaultHeight); resize(st::windowDefaultWidth, st::windowDefaultHeight);
@ -545,7 +549,7 @@ bool MainWindow::markingAsRead() const {
&& !_main->isHidden() && !_main->isHidden()
&& !_main->animatingShow() && !_main->animatingShow()
&& !_layer && !_layer
&& (AutoScrollInactiveChat().value() && (AutoScrollInactiveChat.value()
|| (isActive() && !_main->session().updates().isIdle())); || (isActive() && !_main->session().updates().isIdle()));
} }

2
Telegram/SourceFiles/mainwindow.h
View file

@ -42,6 +42,8 @@ class LayerStackWidget;
class MediaPreviewWidget; class MediaPreviewWidget;
extern const char kOptionAutoScrollInactiveChat[];
class MainWindow : public Platform::MainWindow { class MainWindow : public Platform::MainWindow {
public: public:
explicit MainWindow(not_null<Window::Controller*> controller); explicit MainWindow(not_null<Window::Controller*> controller);

2
Telegram/SourceFiles/settings/settings_experimental.cpp
View file

@ -19,8 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_panel.h"
#include "dialogs/dialogs_inner_widget.h" #include "dialogs/dialogs_inner_widget.h"
#include "history/history_widget.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h"
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
#include "webview/webview_embed.h" #include "webview/webview_embed.h"
#include "window/window_peer_menu.h" #include "window/window_peer_menu.h"