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

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

View file

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

View file

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

View file

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

View file

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