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

Revert "Added experimental option to disable floating reactions strip."

Browse source 
This reverts commit a32a9aa3fc.
This commit is contained in:
23rd 2024-10-14 06:22:30 +03:00 • committed by John Preston
parent 9ea78f7d28
commit c5add2fca9
4 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
View file

@ -22,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "base/event_filter.h" #include "base/event_filter.h"
#include "base/options.h"
#include "styles/style_chat.h" #include "styles/style_chat.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
#include "styles/style_menu_icons.h" #include "styles/style_menu_icons.h"
@ -60,15 +59,8 @@ constexpr auto kRefreshListDelay = crl::time(100);
return CountMaxSizeWithMargins(st::reactionCornerShadow); return CountMaxSizeWithMargins(st::reactionCornerShadow);
} }
base::options::toggle OptionDisableFloatReactions({
.id = kOptionDisableFloatReactions,
.name = "Disable floating reactions strip",
});
} // namespace } // namespace
const char kOptionDisableFloatReactions[] = "disable-float-reactions";
Button::Button( Button::Button(
Fn<void(QRect)> update, Fn<void(QRect)> update,
ButtonParameters parameters, ButtonParameters parameters,
@ -453,11 +445,6 @@ void Manager::showButtonDelayed() {
void Manager::applyList(const Data::PossibleItemReactionsRef &reactions) { void Manager::applyList(const Data::PossibleItemReactionsRef &reactions) {
using Button = Strip::AddedButton; using Button = Strip::AddedButton;
if (OptionDisableFloatReactions.value()) {
_strip.applyList({}, Button::None);
_tagsStrip = {};
return;
}
_strip.applyList( _strip.applyList(
reactions.recent, reactions.recent,
(/*reactions.customAllowed (/*reactions.customAllowed

2
Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
View file

@ -38,8 +38,6 @@ class Session;
namespace HistoryView::Reactions { namespace HistoryView::Reactions {
extern const char kOptionDisableFloatReactions[];
enum class ExpandDirection { enum class ExpandDirection {
Up, Up,
Down, Down,

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

@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_panel.h"
#include "dialogs/dialogs_widget.h" #include "dialogs/dialogs_widget.h"
#include "info/profile/info_profile_actions.h" #include "info/profile/info_profile_actions.h"
#include "history/view/reactions/history_view_reactions_button.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
@ -158,7 +157,6 @@ void SetupExperimental(
addToggle(Data::kOptionExternalVideoPlayer); addToggle(Data::kOptionExternalVideoPlayer);
addToggle(Window::kOptionNewWindowsSizeAsFirst); addToggle(Window::kOptionNewWindowsSizeAsFirst);
addToggle(Window::kOptionDisableTouchbar); addToggle(Window::kOptionDisableTouchbar);
addToggle(HistoryView::Reactions::kOptionDisableFloatReactions);
} }
} // namespace } // namespace

3
Telegram/SourceFiles/window/main_window.cpp
View file

@ -76,8 +76,7 @@ base::options::toggle OptionNewWindowsSizeAsFirst({
base::options::toggle OptionDisableTouchbar({ base::options::toggle OptionDisableTouchbar({
.id = kOptionDisableTouchbar, .id = kOptionDisableTouchbar,
.name = "Disable Touch Bar.", .name = "Disable Touch Bar (macOS only).",
.description = "macOS only",
.scope = [] { .scope = [] {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
return true; return true;