From 18195f9c4e2b8faa8e117ac836cccce545e4fe57 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 24 May 2017 13:10:04 +0300 Subject: [PATCH] Rename EmojiPanelTab to ChatHelpers::SelectorTab. --- Telegram/SourceFiles/auth_session.cpp | 18 ++++++------ Telegram/SourceFiles/auth_session.h | 20 ++++++------- .../SourceFiles/chat_helpers/tabbed_panel.cpp | 8 +++--- .../chat_helpers/tabbed_section.cpp | 4 +-- .../chat_helpers/tabbed_selector.cpp | 28 +++++++++---------- .../chat_helpers/tabbed_selector.h | 27 ++++++++++-------- 6 files changed, 55 insertions(+), 50 deletions(-) diff --git a/Telegram/SourceFiles/auth_session.cpp b/Telegram/SourceFiles/auth_session.cpp index 661e5d76b..90c1f158c 100644 --- a/Telegram/SourceFiles/auth_session.cpp +++ b/Telegram/SourceFiles/auth_session.cpp @@ -29,6 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "calls/calls_instance.h" #include "window/section_widget.h" +#include "chat_helpers/tabbed_selector.h" namespace { @@ -37,7 +38,8 @@ constexpr auto kAutoLockTimeoutLateMs = TimeMs(3000); } // namespace AuthSessionData::Variables::Variables() -: floatPlayerColumn(Window::Column::Second) +: selectorTab(ChatHelpers::SelectorTab::Emoji) +, floatPlayerColumn(Window::Column::Second) , floatPlayerCorner(Window::Corner::TopRight) { } @@ -57,7 +59,7 @@ QByteArray AuthSessionData::serialize() const { QDataStream stream(&buffer); stream.setVersion(QDataStream::Qt_5_1); - stream << static_cast(_variables.emojiPanelTab); + stream << static_cast(_variables.selectorTab); stream << qint32(_variables.lastSeenWarningSeen ? 1 : 0); stream << qint32(_variables.tabbedSelectorSectionEnabled ? 1 : 0); stream << qint32(_variables.soundOverrides.size()); @@ -83,14 +85,14 @@ void AuthSessionData::constructFromSerialized(const QByteArray &serialized) { } QDataStream stream(&buffer); stream.setVersion(QDataStream::Qt_5_1); - qint32 emojiPanTab = static_cast(EmojiPanelTab::Emoji); + qint32 selectorTab = static_cast(ChatHelpers::SelectorTab::Emoji); qint32 lastSeenWarningSeen = 0; qint32 tabbedSelectorSectionEnabled = 1; qint32 tabbedSelectorSectionTooltipShown = 0; qint32 floatPlayerColumn = static_cast(Window::Column::Second); qint32 floatPlayerCorner = static_cast(Window::Corner::TopRight); QMap soundOverrides; - stream >> emojiPanTab; + stream >> selectorTab; stream >> lastSeenWarningSeen; if (!stream.atEnd()) { stream >> tabbedSelectorSectionEnabled; @@ -117,11 +119,11 @@ void AuthSessionData::constructFromSerialized(const QByteArray &serialized) { return; } - auto uncheckedTab = static_cast(emojiPanTab); + auto uncheckedTab = static_cast(selectorTab); switch (uncheckedTab) { - case EmojiPanelTab::Emoji: - case EmojiPanelTab::Stickers: - case EmojiPanelTab::Gifs: _variables.emojiPanelTab = uncheckedTab; break; + case ChatHelpers::SelectorTab::Emoji: + case ChatHelpers::SelectorTab::Stickers: + case ChatHelpers::SelectorTab::Gifs: _variables.selectorTab = uncheckedTab; break; } _variables.lastSeenWarningSeen = (lastSeenWarningSeen == 1); _variables.tabbedSelectorSectionEnabled = (tabbedSelectorSectionEnabled == 1); diff --git a/Telegram/SourceFiles/auth_session.h b/Telegram/SourceFiles/auth_session.h index e45e7146b..03734625b 100644 --- a/Telegram/SourceFiles/auth_session.h +++ b/Telegram/SourceFiles/auth_session.h @@ -38,13 +38,11 @@ namespace Calls { class Instance; } // namespace Calls -class ApiWrap; +namespace ChatHelpers { +enum class SelectorTab; +} // namespace ChatHelpers -enum class EmojiPanelTab { - Emoji, - Stickers, - Gifs, -}; +class ApiWrap; class AuthSessionData final { public: @@ -73,11 +71,11 @@ public: void setLastSeenWarningSeen(bool lastSeenWarningSeen) { _variables.lastSeenWarningSeen = lastSeenWarningSeen; } - EmojiPanelTab emojiPanelTab() const { - return _variables.emojiPanelTab; + ChatHelpers::SelectorTab selectorTab() const { + return _variables.selectorTab; } - void setEmojiPanelTab(EmojiPanelTab tab) { - _variables.emojiPanelTab = tab; + void setSelectorTab(ChatHelpers::SelectorTab tab) { + _variables.selectorTab = tab; } bool tabbedSelectorSectionEnabled() const { return _variables.tabbedSelectorSectionEnabled; @@ -122,7 +120,7 @@ private: Variables(); bool lastSeenWarningSeen = false; - EmojiPanelTab emojiPanelTab = EmojiPanelTab::Emoji; + ChatHelpers::SelectorTab selectorTab; bool tabbedSelectorSectionEnabled = true; int tabbedSelectorSectionTooltipShown = 0; QMap soundOverrides; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp index 6f169ce79..ad184af2c 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp @@ -42,13 +42,13 @@ TabbedPanel::TabbedPanel(QWidget *parent, gsl::not_null con , _selector(std::move(selector)) { _selector->setParent(this); _selector->setRoundRadius(st::buttonRadius); - _selector->setAfterShownCallback([this](EmojiPanelTab tab) { - if (tab == EmojiPanelTab::Gifs) { + _selector->setAfterShownCallback([this](SelectorTab tab) { + if (tab == SelectorTab::Gifs) { _controller->enableGifPauseReason(Window::GifPauseReason::SavedGifs); } }); - _selector->setBeforeHidingCallback([this](EmojiPanelTab tab) { - if (tab == EmojiPanelTab::Gifs) { + _selector->setBeforeHidingCallback([this](SelectorTab tab) { + if (tab == SelectorTab::Gifs) { _controller->disableGifPauseReason(Window::GifPauseReason::SavedGifs); } }); diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp index aeea08dfb..bdf839b47 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp @@ -42,8 +42,8 @@ TabbedSection::TabbedSection(QWidget *parent, gsl::not_null _cancelledCallback(); } }); - _selector->setAfterShownCallback(base::lambda()); - _selector->setBeforeHidingCallback(base::lambda()); + _selector->setAfterShownCallback(base::lambda()); + _selector->setBeforeHidingCallback(base::lambda()); setAttribute(Qt::WA_OpaquePaintEvent, true); } diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index 8ef926079..3699ff1b4 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -258,7 +258,7 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, float64 dt, float64 p.drawImage(outerLeft / cIntRetinaFactor(), outerTop / cIntRetinaFactor(), _frame, outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop); } -TabbedSelector::Tab::Tab(TabType type, object_ptr widget) +TabbedSelector::Tab::Tab(SelectorTab type, object_ptr widget) : _type(type) , _widget(std::move(widget)) , _weak(_widget) @@ -285,11 +285,11 @@ TabbedSelector::TabbedSelector(QWidget *parent, gsl::not_null(this, controller) }, - Tab { TabType::Stickers, object_ptr(this, controller) }, - Tab { TabType::Gifs, object_ptr(this, controller) }, + Tab { SelectorTab::Emoji, object_ptr(this, controller) }, + Tab { SelectorTab::Stickers, object_ptr(this, controller) }, + Tab { SelectorTab::Gifs, object_ptr(this, controller) }, } } -, _currentTabType(AuthSession::Current().data().emojiPanelTab()) { +, _currentTabType(AuthSession::Current().data().selectorTab()) { resize(st::emojiPanWidth, st::emojiPanMaxHeight); for (auto &tab : _tabs) { @@ -394,7 +394,7 @@ void TabbedSelector::paintSlideFrame(Painter &p, TimeMs ms) { } void TabbedSelector::paintContent(Painter &p) { - auto showSectionIcons = (_currentTabType != TabType::Gifs); + auto showSectionIcons = (_currentTabType != SelectorTab::Gifs); auto &bottomBg = showSectionIcons ? st::emojiPanCategories : st::emojiPanBg; if (_roundRadius > 0) { auto topPart = QRect(0, 0, width(), _tabsSlider->height() + _roundRadius); @@ -424,7 +424,7 @@ int TabbedSelector::marginBottom() const { void TabbedSelector::refreshStickers() { stickers()->refreshStickers(); - if (isHidden() || _currentTabType != TabType::Stickers) { + if (isHidden() || _currentTabType != SelectorTab::Stickers) { stickers()->preloadImages(); } } @@ -500,7 +500,7 @@ void TabbedSelector::afterShown() { } void TabbedSelector::stickersInstalled(uint64 setId) { - _tabsSlider->setActiveSection(static_cast(TabType::Stickers)); + _tabsSlider->setActiveSection(static_cast(SelectorTab::Stickers)); stickers()->showStickerSet(setId); } @@ -512,7 +512,7 @@ void TabbedSelector::showAll() { currentTab()->footer()->show(); _scroll->show(); _topShadow->show(); - _bottomShadow->setVisible(_currentTabType == TabType::Gifs); + _bottomShadow->setVisible(_currentTabType == SelectorTab::Gifs); _tabsSlider->show(); } @@ -554,7 +554,7 @@ void TabbedSelector::createTabsSlider() { void TabbedSelector::switchTab() { auto tab = _tabsSlider->activeSection(); t_assert(tab >= 0 && tab < Tab::kCount); - auto newTabType = static_cast(tab); + auto newTabType = static_cast(tab); if (_currentTabType == newTabType) { return; } @@ -597,20 +597,20 @@ void TabbedSelector::switchTab() { _a_slide.start([this] { update(); }, 0., 1., st::emojiPanSlideDuration, anim::linear); update(); - AuthSession::Current().data().setEmojiPanelTab(_currentTabType); + AuthSession::Current().data().setSelectorTab(_currentTabType); AuthSession::Current().saveDataDelayed(kSaveChosenTabTimeout); } gsl::not_null TabbedSelector::emoji() const { - return static_cast(getTab(TabType::Emoji)->widget().get()); + return static_cast(getTab(SelectorTab::Emoji)->widget().get()); } gsl::not_null TabbedSelector::stickers() const { - return static_cast(getTab(TabType::Stickers)->widget().get()); + return static_cast(getTab(SelectorTab::Stickers)->widget().get()); } gsl::not_null TabbedSelector::gifs() const { - return static_cast(getTab(TabType::Gifs)->widget().get()); + return static_cast(getTab(SelectorTab::Gifs)->widget().get()); } void TabbedSelector::setWidgetToScrollArea() { diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h index 0b4553245..8f84389ac 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h @@ -41,6 +41,12 @@ class Controller; namespace ChatHelpers { +enum class SelectorTab { + Emoji, + Stickers, + Gifs, +}; + class EmojiListWidget; class StickersListWidget; class GifsListWidget; @@ -69,11 +75,10 @@ public: return _a_slide.animating(); } - using TabType = EmojiPanelTab; - void setAfterShownCallback(base::lambda callback) { + void setAfterShownCallback(base::lambda callback) { _afterShownCallback = std::move(callback); } - void setBeforeHidingCallback(base::lambda callback) { + void setBeforeHidingCallback(base::lambda callback) { _beforeHidingCallback = std::move(callback); } @@ -110,12 +115,12 @@ private: public: static constexpr auto kCount = 3; - Tab(TabType type, object_ptr widget); + Tab(SelectorTab type, object_ptr widget); object_ptr takeWidget(); void returnWidget(object_ptr widget); - TabType type() const { + SelectorTab type() const { return _type; } gsl::not_null widget() const { @@ -134,7 +139,7 @@ private: } private: - TabType _type = TabType::Emoji; + SelectorTab _type = SelectorTab::Emoji; object_ptr _widget = { nullptr }; QPointer _weak; object_ptr _footer; @@ -155,10 +160,10 @@ private: void setWidgetToScrollArea(); void createTabsSlider(); void switchTab(); - gsl::not_null getTab(TabType type) { + gsl::not_null getTab(SelectorTab type) { return &_tabs[static_cast(type)]; } - gsl::not_null getTab(TabType type) const { + gsl::not_null getTab(SelectorTab type) const { return &_tabs[static_cast(type)]; } gsl::not_null currentTab() { @@ -183,10 +188,10 @@ private: object_ptr _bottomShadow; object_ptr _scroll; std::array _tabs; - TabType _currentTabType = TabType::Emoji; + SelectorTab _currentTabType = SelectorTab::Emoji; - base::lambda _afterShownCallback; - base::lambda _beforeHidingCallback; + base::lambda _afterShownCallback; + base::lambda _beforeHidingCallback; };