From e880c4876eafe138dc1450d660801ba90db573ee Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 20 Nov 2016 15:54:07 +0300 Subject: [PATCH] Strict alignment request for base::lambda. Various improvements. --- .../Resources/icons/overview_photo_check.png | Bin 243 -> 313 bytes .../icons/overview_photo_check@2x.png | Bin 424 -> 632 bytes Telegram/Resources/langs/lang.strings | 4 +- Telegram/SourceFiles/apiwrap.cpp | 4 +- Telegram/SourceFiles/apiwrap.h | 4 +- Telegram/SourceFiles/boxes/addcontactbox.cpp | 2 +- Telegram/SourceFiles/boxes/addcontactbox.h | 4 +- Telegram/SourceFiles/boxes/backgroundbox.h | 1 - Telegram/SourceFiles/boxes/confirmbox.h | 4 +- Telegram/SourceFiles/boxes/contactsbox.cpp | 6 +- Telegram/SourceFiles/boxes/contactsbox.h | 10 +- Telegram/SourceFiles/boxes/sharebox.cpp | 6 +- Telegram/SourceFiles/boxes/sharebox.h | 13 ++- Telegram/SourceFiles/core/click_handler.h | 4 +- .../SourceFiles/core/click_handler_types.cpp | 4 +- .../core/{lambda_wrap.h => lambda.h} | 88 ++++++++---------- Telegram/SourceFiles/core/observer.h | 6 +- Telegram/SourceFiles/core/single_timer.cpp | 2 +- Telegram/SourceFiles/core/single_timer.h | 5 +- Telegram/SourceFiles/dialogswidget.cpp | 2 +- Telegram/SourceFiles/facades.cpp | 10 +- Telegram/SourceFiles/historywidget.cpp | 22 ++++- Telegram/SourceFiles/historywidget.h | 1 + Telegram/SourceFiles/intro/intro.style | 25 +++-- Telegram/SourceFiles/intro/introwidget.cpp | 8 +- Telegram/SourceFiles/intro/introwidget.h | 2 - Telegram/SourceFiles/layerwidget.cpp | 4 +- Telegram/SourceFiles/mainwidget.cpp | 8 +- Telegram/SourceFiles/mainwidget.h | 3 +- .../SourceFiles/media/media_clip_reader.h | 2 +- .../media/player/media_player_cover.h | 2 +- .../media/player/media_player_panel.h | 2 +- .../media/player/media_player_widget.h | 2 +- Telegram/SourceFiles/mtproto/rpc_sender.h | 26 +++--- Telegram/SourceFiles/observer_peer.h | 2 +- Telegram/SourceFiles/overview/overview.style | 10 +- .../profile/profile_cover_drop_area.h | 2 +- .../SourceFiles/settings/settings_widget.cpp | 2 +- Telegram/SourceFiles/stdafx.h | 1 + Telegram/SourceFiles/stickers/emoji_pan.cpp | 14 ++- Telegram/SourceFiles/ui/abstract_button.h | 5 +- Telegram/SourceFiles/ui/animation.h | 11 +-- .../ui/effects/ripple_animation.cpp | 16 ++-- .../SourceFiles/ui/effects/ripple_animation.h | 8 +- .../ui/effects/round_image_checkbox.cpp | 4 +- .../ui/effects/round_image_checkbox.h | 6 +- .../ui/effects/widget_fade_wrap.cpp | 2 +- .../SourceFiles/ui/effects/widget_fade_wrap.h | 10 +- .../ui/effects/widget_slide_wrap.cpp | 2 +- .../ui/effects/widget_slide_wrap.h | 6 +- .../ui/widgets/continuous_slider.h | 2 +- .../SourceFiles/ui/widgets/discrete_slider.h | 2 +- .../SourceFiles/ui/widgets/dropdown_menu.cpp | 2 +- .../SourceFiles/ui/widgets/dropdown_menu.h | 6 +- .../SourceFiles/ui/widgets/inner_dropdown.h | 12 +-- Telegram/SourceFiles/ui/widgets/labels.h | 2 +- Telegram/SourceFiles/ui/widgets/menu.cpp | 2 +- Telegram/SourceFiles/ui/widgets/menu.h | 30 +++--- .../SourceFiles/ui/widgets/multi_select.cpp | 34 +++---- .../SourceFiles/ui/widgets/multi_select.h | 36 +++---- .../SourceFiles/ui/widgets/popup_menu.cpp | 2 +- Telegram/SourceFiles/ui/widgets/popup_menu.h | 2 +- .../SourceFiles/ui/widgets/scroll_area.cpp | 1 - Telegram/SourceFiles/ui/widgets/shadow.h | 3 +- .../window/notifications_manager_default.cpp | 2 +- .../window/notifications_manager_default.h | 2 +- .../SourceFiles/window/player_wrap_widget.cpp | 2 +- .../SourceFiles/window/player_wrap_widget.h | 2 +- Telegram/SourceFiles/window/slide_animation.h | 4 +- .../SourceFiles/window/top_bar_widget.cpp | 2 +- .../SourceFiles/window/window_theme_warning.h | 4 +- Telegram/gyp/Telegram.gyp | 2 +- 72 files changed, 278 insertions(+), 265 deletions(-) rename Telegram/SourceFiles/core/{lambda_wrap.h => lambda.h} (84%) diff --git a/Telegram/Resources/icons/overview_photo_check.png b/Telegram/Resources/icons/overview_photo_check.png index f9a406ce2692e1b196e2b9d157a0c505ff571f97..6d6591b70b09bf6fac01e9532e9a2303c1ff91b2 100644 GIT binary patch literal 313 zcmV-90mlA`P)!QVELI`xu<-{QbR7#x*DHET~P)dp3`^O~@F#y8Lr; zUtkypq?BI1sy6`mD30?B^E?9~1P~F%afGI6U|rX<@B)t{{|A&IdPE?N83j`7f-;hK^gr{kY!CH%| zB2SUBEOE{OV6A-y9g%I@sH!R+DvII`iGzM1;m{eW>-sz+WLZXqVbJleQzh#-C6v&R_=Mnn)*Wtyf77KQ9PI%C5yuq?|5X__YFAn!s|ndg~f tc<*W3HuOEd%@K=4u79MejN=%K@B+cPqn^2aCq)1N002ovPDHLkV1ntyVhsQQ diff --git a/Telegram/Resources/icons/overview_photo_check@2x.png b/Telegram/Resources/icons/overview_photo_check@2x.png index 6ab0cbd9c9f46554607b5ac59c0acb98123fc212..20601fcb8cfcff7662cd45e8a45d5a7ba29b8ff1 100644 GIT binary patch literal 632 zcmV-;0*C#HP)*U{QmhVlWy_Hk-kqSWE^D3L?V%0T#h1 zf?)Dn$9XnfcG=6`IXiy4un$a{^Pc(fo-=1)R73>&f%)@nz@_zhirBYq8{n!KY`Mm5yTdkICr$V6+cDtQyttg6!$K%($H|0004RNkl&otZ6-Et+F^1FW^dHRp zAj2?vF;!Jzv)K&w_$o{bvTYmt{T{lmuZj5ubr&7yd@{-~3>=TgUd+=rf1fUJ*S4WS;7hic3#h=>pbK`%;%@qK?Tj2tu; zr2x|pYEbw4U5XJxsKC4j5fQ>Ld_f5z5Cnk=%rNK~r5G~~L`2x_cF3|!H3mPR369bT SlT=m!0000call(); } diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 23e453bee..964404fe0 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -30,8 +30,8 @@ public: ApiWrap(QObject *parent); void init(); - using RequestMessageDataCallback = base::lambda_wrap; - void requestMessageData(ChannelData *channel, MsgId msgId, RequestMessageDataCallback &&callback); + using RequestMessageDataCallback = base::lambda_copy; + void requestMessageData(ChannelData *channel, MsgId msgId, const RequestMessageDataCallback &callback); void requestFullPeer(PeerData *peer); void requestPeer(PeerData *peer); diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/addcontactbox.cpp index 2a3d7ee55..868b29926 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.cpp +++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp @@ -1150,7 +1150,7 @@ void EditChannelBox::onSaveSignDone(const MTPUpdates &updates) { onClose(); } -RevokePublicLinkBox::RevokePublicLinkBox(base::lambda_unique &&revokeCallback) : AbstractBox() +RevokePublicLinkBox::RevokePublicLinkBox(base::lambda &&revokeCallback) : AbstractBox() , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke))) , _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) diff --git a/Telegram/SourceFiles/boxes/addcontactbox.h b/Telegram/SourceFiles/boxes/addcontactbox.h index 3d7e01e34..4267d30a4 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.h +++ b/Telegram/SourceFiles/boxes/addcontactbox.h @@ -286,7 +286,7 @@ class RevokePublicLinkBox : public AbstractBox, public RPCSender { Q_OBJECT public: - RevokePublicLinkBox(base::lambda_unique &&revokeCallback); + RevokePublicLinkBox(base::lambda &&revokeCallback); protected: void mouseMoveEvent(QMouseEvent *e) override; @@ -323,7 +323,7 @@ private: ChildWidget _aboutRevoke; ChildWidget _cancel; - base::lambda_unique _revokeCallback; + base::lambda _revokeCallback; mtpRequestId _revokeRequestId = 0; QPointer weakRevokeConfirmBox; diff --git a/Telegram/SourceFiles/boxes/backgroundbox.h b/Telegram/SourceFiles/boxes/backgroundbox.h index 00854571c..bfd8a6dc3 100644 --- a/Telegram/SourceFiles/boxes/backgroundbox.h +++ b/Telegram/SourceFiles/boxes/backgroundbox.h @@ -21,7 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "boxes/abstractbox.h" -#include "core/lambda_wrap.h" class BackgroundBox : public ItemListBox { Q_OBJECT diff --git a/Telegram/SourceFiles/boxes/confirmbox.h b/Telegram/SourceFiles/boxes/confirmbox.h index fb4cdbc02..b0a7fc8cf 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.h +++ b/Telegram/SourceFiles/boxes/confirmbox.h @@ -43,7 +43,7 @@ public: void updateLink(); // You can use this instead of connecting to "confirmed()" signal. - void setConfirmedCallback(base::lambda_unique &&callback) { + void setConfirmedCallback(base::lambda &&callback) { _confirmedCallback = std_::move(callback); } @@ -92,7 +92,7 @@ private: ChildWidget _confirm; ChildWidget _cancel; - base::lambda_unique _confirmedCallback; + base::lambda _confirmedCallback; }; diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index 9b78ddf6d..5363b0ff6 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -545,8 +545,8 @@ bool ContactsBox::creationFail(const RPCError &error) { return false; } -ContactsBox::Inner::ContactData::ContactData(PeerData *peer, base::lambda_wrap updateCallback) -: checkbox(std_::make_unique(st::contactsPhotoCheckbox, std_::move(updateCallback), PaintUserpicCallback(peer))) { +ContactsBox::Inner::ContactData::ContactData(PeerData *peer, const base::lambda_copy &updateCallback) +: checkbox(std_::make_unique(st::contactsPhotoCheckbox, updateCallback, PaintUserpicCallback(peer))) { } ContactsBox::Inner::Inner(QWidget *parent, CreatingGroupType creating) : TWidget(parent) @@ -1371,7 +1371,7 @@ void ContactsBox::Inner::peerUnselected(PeerData *peer) { changePeerCheckState(data, peer, false, ChangeStateWay::SkipCallback); } -void ContactsBox::Inner::setPeerSelectedChangedCallback(base::lambda_unique callback) { +void ContactsBox::Inner::setPeerSelectedChangedCallback(base::lambda &&callback) { _peerSelectedChangedCallback = std_::move(callback); } diff --git a/Telegram/SourceFiles/boxes/contactsbox.h b/Telegram/SourceFiles/boxes/contactsbox.h index 5df204e0b..f6effb5f0 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.h +++ b/Telegram/SourceFiles/boxes/contactsbox.h @@ -145,7 +145,7 @@ public: Inner(QWidget *parent, ChatData *chat, MembersFilter membersFilter); Inner(QWidget *parent, UserData *bot); - void setPeerSelectedChangedCallback(base::lambda_unique callback); + void setPeerSelectedChangedCallback(base::lambda &&callback); void peerUnselected(PeerData *peer); void updateFilter(QString filter = QString()); @@ -157,7 +157,7 @@ public: QVector selected(); QVector selectedInputs(); bool allAdmins() const; - void setAllAdminsChangedCallback(base::lambda_unique allAdminsChangedCallback) { + void setAllAdminsChangedCallback(base::lambda &&allAdminsChangedCallback) { _allAdminsChangedCallback = std_::move(allAdminsChangedCallback); } @@ -213,7 +213,7 @@ protected: private: struct ContactData { ContactData() = default; - ContactData(PeerData *peer, base::lambda_wrap updateCallback); + ContactData(PeerData *peer, const base::lambda_copy &updateCallback); std_::unique_ptr checkbox; Text name; @@ -251,7 +251,7 @@ private: return (_chat != nullptr) || (_creating != CreatingGroupNone && (!_channel || _membersFilter != MembersFilter::Admins)); } - base::lambda_unique _peerSelectedChangedCallback; + base::lambda _peerSelectedChangedCallback; int _rowHeight; int _aboutHeight = 0; @@ -266,7 +266,7 @@ private: ChildWidget _allAdmins; int32 _aboutWidth; Text _aboutAllAdmins, _aboutAdmins; - base::lambda_unique _allAdminsChangedCallback; + base::lambda _allAdminsChangedCallback; PeerData *_addToPeer = nullptr; UserData *_addAdmin = nullptr; diff --git a/Telegram/SourceFiles/boxes/sharebox.cpp b/Telegram/SourceFiles/boxes/sharebox.cpp index 9819a2f86..675bd5157 100644 --- a/Telegram/SourceFiles/boxes/sharebox.cpp +++ b/Telegram/SourceFiles/boxes/sharebox.cpp @@ -513,9 +513,9 @@ void ShareBox::Inner::paintChat(Painter &p, uint64 ms, Chat *chat, int index) { chat->name.drawLeftElided(p, x + nameLeft, y + nameTop, nameWidth, outerWidth, 2, style::al_top, 0, -1, 0, true); } -ShareBox::Inner::Chat::Chat(PeerData *peer, base::lambda_wrap updateCallback) +ShareBox::Inner::Chat::Chat(PeerData *peer, const base::lambda_copy &updateCallback) : peer(peer) -, checkbox(st::sharePhotoCheckbox, std_::move(updateCallback), PaintUserpicCallback(peer)) +, checkbox(st::sharePhotoCheckbox, updateCallback, PaintUserpicCallback(peer)) , name(st::sharePhotoCheckbox.imageRadius * 2) { } @@ -649,7 +649,7 @@ void ShareBox::Inner::peerUnselected(PeerData *peer) { changePeerCheckState(chat, false, ChangeStateWay::SkipCallback); } -void ShareBox::Inner::setPeerSelectedChangedCallback(base::lambda_unique callback) { +void ShareBox::Inner::setPeerSelectedChangedCallback(base::lambda &&callback) { _peerSelectedChangedCallback = std_::move(callback); } diff --git a/Telegram/SourceFiles/boxes/sharebox.h b/Telegram/SourceFiles/boxes/sharebox.h index dc8349d92..5122e3af7 100644 --- a/Telegram/SourceFiles/boxes/sharebox.h +++ b/Telegram/SourceFiles/boxes/sharebox.h @@ -21,7 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "boxes/abstractbox.h" -#include "core/lambda_wrap.h" #include "core/observer.h" #include "core/vector_of_moveable.h" #include "ui/effects/round_image_checkbox.h" @@ -47,9 +46,9 @@ class ShareBox : public ItemListBox, public RPCSender { Q_OBJECT public: - using CopyCallback = base::lambda_unique; - using SubmitCallback = base::lambda_unique &)>; - using FilterCallback = base::lambda_unique; + using CopyCallback = base::lambda; + using SubmitCallback = base::lambda &)>; + using FilterCallback = base::lambda; ShareBox(CopyCallback &©Callback, SubmitCallback &&submitCallback, FilterCallback &&filterCallback); private slots: @@ -119,7 +118,7 @@ class ShareBox::Inner : public TWidget, public RPCSender, private base::Subscrib public: Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback); - void setPeerSelectedChangedCallback(base::lambda_unique callback); + void setPeerSelectedChangedCallback(base::lambda &&callback); void peerUnselected(PeerData *peer); QVector selected() const; @@ -157,7 +156,7 @@ private: int displayedChatsCount() const; struct Chat { - Chat(PeerData *peer, base::lambda_wrap updateCallback); + Chat(PeerData *peer, const base::lambda_copy &updateCallback); PeerData *peer; Ui::RoundImageCheckbox checkbox; @@ -207,7 +206,7 @@ private: using SelectedChats = OrderedSet; SelectedChats _selected; - base::lambda_unique _peerSelectedChangedCallback; + base::lambda _peerSelectedChangedCallback; ChatData *data(Dialogs::Row *row); diff --git a/Telegram/SourceFiles/core/click_handler.h b/Telegram/SourceFiles/core/click_handler.h index 467158d24..867b32f1c 100644 --- a/Telegram/SourceFiles/core/click_handler.h +++ b/Telegram/SourceFiles/core/click_handler.h @@ -181,7 +181,7 @@ protected: class LambdaClickHandler : public ClickHandler { public: - LambdaClickHandler(base::lambda_unique handler) : _handler(std_::move(handler)) { + LambdaClickHandler(base::lambda &&handler) : _handler(std_::move(handler)) { } void onClick(Qt::MouseButton button) const override final { if (button == Qt::LeftButton && _handler) { @@ -190,6 +190,6 @@ public: } private: - base::lambda_unique _handler; + base::lambda _handler; }; diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index c43a4b373..3adfc1c85 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -40,8 +40,8 @@ QString tryConvertUrlToLocal(QString url) { using namespace qthelp; auto matchOptions = RegExOption::CaseInsensitive; - if (auto telegramMeMatch = regex_match(qsl("https?://telegram\\.me/(.+)$"), url, matchOptions)) { - auto query = telegramMeMatch->capturedRef(1); + if (auto telegramMeMatch = regex_match(qsl("https?://(www\\.)?telegram\\.me/(.+)$"), url, matchOptions)) { + auto query = telegramMeMatch->capturedRef(2); if (auto joinChatMatch = regex_match(qsl("^joinchat/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"), query, matchOptions)) { return qsl("tg://join?invite=") + url_encode(joinChatMatch->captured(1)); } else if (auto stickerSetMatch = regex_match(qsl("^addstickers/([a-zA-Z0-9\\.\\_]+)(\\?|$)"), query, matchOptions)) { diff --git a/Telegram/SourceFiles/core/lambda_wrap.h b/Telegram/SourceFiles/core/lambda.h similarity index 84% rename from Telegram/SourceFiles/core/lambda_wrap.h rename to Telegram/SourceFiles/core/lambda.h index a29afbaaa..dca6cbb58 100644 --- a/Telegram/SourceFiles/core/lambda_wrap.h +++ b/Telegram/SourceFiles/core/lambda.h @@ -147,9 +147,8 @@ struct lambda_wrap_helper_move_impl : static void construct_move_lambda_method(void *lambda, void *source) { static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment."); auto space = sizeof(JustLambda); - // We want to be able to pass lambda by value in 32bit Windows version. - //auto aligned = std_::align(alignof(JustLambda), space, lambda, space); - //t_assert(aligned == lambda); + auto aligned = std_::align(alignof(JustLambda), space, lambda, space); + t_assert(aligned == lambda); auto source_lambda = static_cast(source); new (lambda) JustLambda(static_cast(*source_lambda)); } @@ -223,9 +222,8 @@ struct lambda_wrap_helper_copy_impl : static void construct_copy_lambda_method(void *lambda, const void *source) { static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment."); auto space = sizeof(JustLambda); - // We want to be able to pass lambda by value in 32bit Windows version. - //auto aligned = std_::align(alignof(JustLambda), space, lambda, space); - //t_assert(aligned == lambda); + auto aligned = std_::align(alignof(JustLambda), space, lambda, space); + t_assert(aligned == lambda); auto source_lambda = static_cast(source); new (lambda) JustLambda(static_cast(*source_lambda)); } @@ -246,34 +244,34 @@ const lambda_wrap_helper_copy lambda_wrap_helper_copy class lambda_unique; -template class lambda_wrap; +template class lambda; +template class lambda_copy; template -class lambda_unique { +class lambda { using BaseHelper = internal::lambda_wrap_helper_base; using EmptyHelper = internal::lambda_wrap_empty; template - using IsUnique = std_::is_same>; + using IsUnique = std_::is_same>; template - using IsWrap = std_::is_same, std_::decay_simple_t>; + using IsWrap = std_::is_same, std_::decay_simple_t>; template using IsOther = std_::enable_if_t::value && !IsWrap::value>; template using IsRvalue = std_::enable_if_t::value>; public: - lambda_unique() : helper_(&EmptyHelper::instance) { + lambda() : helper_(&EmptyHelper::instance) { } - lambda_unique(const lambda_unique &other) = delete; - lambda_unique &operator=(const lambda_unique &other) = delete; + lambda(const lambda &other) = delete; + lambda &operator=(const lambda &other) = delete; - lambda_unique(lambda_unique &&other) : helper_(other.helper_) { + lambda(lambda &&other) : helper_(other.helper_) { helper_->construct_move_other(storage_, other.storage_); } - lambda_unique &operator=(lambda_unique &&other) { + lambda &operator=(lambda &&other) { auto temp = std_::move(other); helper_->destruct(storage_); helper_ = temp.helper_; @@ -281,21 +279,17 @@ public: return *this; } - void swap(lambda_unique &other) { - if (this != &other) { - lambda_unique temp = std_::move(other); - other = std_::move(*this); - *this = std_::move(other); - } + void swap(lambda &other) { + if (this != &other) std_::swap_moveable(*this, other); } template , typename = IsRvalue> - lambda_unique(Lambda &&other) : helper_(&internal::lambda_wrap_helper_move::instance) { + lambda(Lambda &&other) : helper_(&internal::lambda_wrap_helper_move::instance) { internal::lambda_wrap_helper_move::construct_move_lambda_method(storage_, &other); } template , typename = IsRvalue> - lambda_unique &operator=(Lambda &&other) { + lambda &operator=(Lambda &&other) { auto temp = std_::move(other); helper_->destruct(storage_); helper_ = &internal::lambda_wrap_helper_move::instance; @@ -311,74 +305,70 @@ public: return (helper_ != &EmptyHelper::instance); } - ~lambda_unique() { + ~lambda() { helper_->destruct(storage_); } protected: struct Private { }; - lambda_unique(const BaseHelper *helper, const Private &) : helper_(helper) { + lambda(const BaseHelper *helper, const Private &) : helper_(helper) { } using alignment = typename BaseHelper::alignment; static_assert(BaseHelper::kStorageSize % sizeof(alignment) == 0, "Bad storage size."); - alignment storage_[BaseHelper::kStorageSize / sizeof(alignment)]; + alignas(typename BaseHelper::alignment) alignment storage_[BaseHelper::kStorageSize / sizeof(alignment)]; const BaseHelper *helper_; }; template -class lambda_wrap : public lambda_unique { +class lambda_copy : public lambda { using BaseHelper = internal::lambda_wrap_helper_base; - using Parent = lambda_unique; + using Parent = lambda; template - using IsOther = std_::enable_if_t>::value>; + using IsOther = std_::enable_if_t>::value>; template using IsRvalue = std_::enable_if_t::value>; template using IsNotRvalue = std_::enable_if_t::value>; public: - lambda_wrap() = default; + lambda_copy() = default; - lambda_wrap(const lambda_wrap &other) : Parent(other.helper_, typename Parent::Private()) { + lambda_copy(const lambda_copy &other) : Parent(other.helper_, typename Parent::Private()) { this->helper_->construct_copy_other(this->storage_, other.storage_); } - lambda_wrap &operator=(const lambda_wrap &other) { + lambda_copy &operator=(const lambda_copy &other) { auto temp = other; temp.swap(*this); return *this; } - lambda_wrap(lambda_wrap &&other) = default; - lambda_wrap &operator=(lambda_wrap &&other) = default; + lambda_copy(lambda_copy &&other) = default; + lambda_copy &operator=(lambda_copy &&other) = default; - void swap(lambda_wrap &other) { - if (this != &other) { - lambda_wrap temp = std_::move(other); - other = std_::move(*this); - *this = std_::move(other); - } + void swap(lambda_copy &other) { + if (this != &other) std_::swap_moveable(*this, other); } - lambda_wrap clone() const { + lambda_copy clone() const { return *this; } template > - lambda_wrap(const Lambda &other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { + lambda_copy(const Lambda &other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { internal::lambda_wrap_helper_copy::construct_copy_lambda_method(this->storage_, &other); } template , typename = IsRvalue> - lambda_wrap(Lambda &&other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { + lambda_copy(Lambda &&other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { internal::lambda_wrap_helper_copy::construct_move_lambda_method(this->storage_, &other); } template > - lambda_wrap &operator=(const Lambda &other) { + lambda_copy &operator=(const Lambda &other) { auto temp = other; this->helper_->destruct(this->storage_); this->helper_ = &internal::lambda_wrap_helper_copy::instance; @@ -387,7 +377,7 @@ public: } template , typename = IsRvalue> - lambda_wrap &operator=(Lambda &&other) { + lambda_copy &operator=(Lambda &&other) { auto temp = std_::move(other); this->helper_->destruct(this->storage_); this->helper_ = &internal::lambda_wrap_helper_copy::instance; @@ -401,7 +391,7 @@ class lambda_slot_wrap : public QObject { Q_OBJECT public: - lambda_slot_wrap(QObject *parent, lambda_unique lambda) : QObject(parent), _lambda(std_::move(lambda)) { + lambda_slot_wrap(QObject *parent, lambda &&lambda) : QObject(parent), _lambda(std_::move(lambda)) { } public slots: @@ -410,11 +400,11 @@ public slots: } private: - lambda_unique _lambda; + lambda _lambda; }; -inline lambda_slot_wrap *lambda_slot(QObject *parent, lambda_unique lambda) { +inline lambda_slot_wrap *lambda_slot(QObject *parent, lambda &&lambda) { return new lambda_slot_wrap(parent, std_::move(lambda)); } diff --git a/Telegram/SourceFiles/core/observer.h b/Telegram/SourceFiles/core/observer.h index c7c724125..e5e425ed5 100644 --- a/Telegram/SourceFiles/core/observer.h +++ b/Telegram/SourceFiles/core/observer.h @@ -26,7 +26,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org namespace base { namespace internal { -using ObservableCallHandlers = base::lambda_unique; +using ObservableCallHandlers = base::lambda; void RegisterPendingObservable(ObservableCallHandlers *handlers); void UnregisterActiveObservable(ObservableCallHandlers *handlers); void UnregisterObservable(ObservableCallHandlers *handlers); @@ -36,12 +36,12 @@ using EventParamType = typename base::type_traits::parameter_type; template struct SubscriptionHandlerHelper { - using type = base::lambda_unique)>; + using type = base::lambda)>; }; template <> struct SubscriptionHandlerHelper { - using type = base::lambda_unique; + using type = base::lambda; }; template diff --git a/Telegram/SourceFiles/core/single_timer.cpp b/Telegram/SourceFiles/core/single_timer.cpp index 7507a8f14..eda7d54ed 100644 --- a/Telegram/SourceFiles/core/single_timer.cpp +++ b/Telegram/SourceFiles/core/single_timer.cpp @@ -31,7 +31,7 @@ SingleTimer::SingleTimer() { } } -void SingleTimer::setTimeoutHandler(base::lambda_unique &&handler) { +void SingleTimer::setTimeoutHandler(base::lambda &&handler) { if (_handler && !handler) { disconnect(this, SIGNAL(timeout()), this, SLOT(onTimeout())); } else if (handler && !_handler) { diff --git a/Telegram/SourceFiles/core/single_timer.h b/Telegram/SourceFiles/core/single_timer.h index 3aa89647a..33e708264 100644 --- a/Telegram/SourceFiles/core/single_timer.h +++ b/Telegram/SourceFiles/core/single_timer.h @@ -21,7 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "core/basic_types.h" -#include "core/lambda_wrap.h" class SingleTimer : public QTimer { // single shot timer with check Q_OBJECT @@ -32,7 +31,7 @@ public: void setSingleShot(bool); // is not available void start(); // is not available - void setTimeoutHandler(base::lambda_unique &&handler); + void setTimeoutHandler(base::lambda &&handler); public slots: void start(int msec); @@ -45,6 +44,6 @@ private slots: private: uint64 _finishing = 0; bool _inited = false; - base::lambda_unique _handler; + base::lambda _handler; }; diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index dfa91712d..bf2e642f9 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -644,7 +644,7 @@ void DialogsInner::contextMenuEvent(QContextMenuEvent *e) { _menuPeer = history->peer; _menu = new Ui::PopupMenu(); - App::main()->fillPeerMenu(_menuPeer, [this](const QString &text, base::lambda_unique callback) { + App::main()->fillPeerMenu(_menuPeer, [this](const QString &text, base::lambda &&callback) { return _menu->addAction(text, std_::move(callback)); }); connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroyed(QObject*))); diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 6a8a88d83..583a4c1fe 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -44,6 +44,12 @@ void sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId rep } } +void hideSingleUseKeyboard(const HistoryItem *msg) { + if (auto m = main()) { + m->hideSingleUseKeyboard(msg->history()->peer, msg->id); + } +} + bool insertBotCommand(const QString &cmd, bool specialGif) { if (auto m = main()) { return m->insertBotCommand(cmd, specialGif); @@ -85,11 +91,13 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) { } break; case ButtonType::RequestLocation: { + hideSingleUseKeyboard(msg); Ui::showLayer(new InformBox(lang(lng_bot_share_location_unavailable))); } break; case ButtonType::RequestPhone: { - SharePhoneConfirmBox *box = new SharePhoneConfirmBox(msg->history()->peer); + hideSingleUseKeyboard(msg); + auto box = new SharePhoneConfirmBox(msg->history()->peer); box->connect(box, SIGNAL(confirmed(PeerData*)), App::main(), SLOT(onSharePhoneWithBot(PeerData*))); Ui::showLayer(box); } break; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 9ff0fbdb5..acb3f9e4a 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -538,7 +538,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) { if (mtop >= 0 || htop >= 0) { enumerateUserpics([&p, &r](HistoryMessage *message, int userpicTop) { - // stop the enumeration if the userpic is above the painted rect + // stop the enumeration if the userpic is below the painted rect if (userpicTop >= r.top() + r.height()) { return false; } @@ -2024,8 +2024,8 @@ void HistoryInner::onUpdateSelected() { if (auto msg = item->toHistoryMessage()) { if (msg->hasFromPhoto()) { enumerateUserpics([&dragState, &lnkhost, &point](HistoryMessage *message, int userpicTop) -> bool { - // stop enumeration if the userpic is above our point - if (userpicTop + st::msgPhotoSize <= point.y()) { + // stop enumeration if the userpic is below our point + if (userpicTop > point.y()) { return false; } @@ -5823,6 +5823,22 @@ void HistoryWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString _field->setFocus(); } +void HistoryWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) { + if (!_peer || _peer != peer) return; + + bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, replyTo)); + if (replyTo) { + if (_replyToId == replyTo) { + cancelReply(); + onCloudDraftSave(); + } + if (_keyboard->singleUse() && _keyboard->hasMarkup() && lastKeyboardUsed) { + if (_kbShown) onKbToggle(false); + _history->lastKeyboardUsed = true; + } + } +} + void HistoryWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, const HistoryItem *msg, int row, int col) { if (msg->id < 0 || _peer != msg->history()->peer) { return; diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index 197d8b334..53b4b823d 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -657,6 +657,7 @@ public: void onListEnterPressed(); void sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo); + void hideSingleUseKeyboard(PeerData *peer, MsgId replyTo); bool insertBotCommand(const QString &cmd, bool specialGif); bool eventFilter(QObject *obj, QEvent *e) override; diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index 43d2aaf37..663f87e5b 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -134,18 +134,17 @@ introErrorLabel: FlatLabel(defaultFlatLabel) { font: introErrorFont; align: align(center); } -introBackButton: IconButton { - width: 40px; - height: 40px; +introBackButton: IconButton(defaultIconButton) { + width: 56px; + height: 56px; - icon: icon { - { size(40px, 40px), #f2f2f2 }, - { "title_back", #adadad, point(12px, 12px) }, - }; - iconOver: icon { - { size(40px, 40px), #eeeeee }, - { "title_back", #969696, point(12px, 12px) }, - }; - iconPosition: point(0px, 0px); + icon: icon {{ "box_button_back", menuIconFg }}; + iconOver: icon {{ "box_button_back", menuIconFgOver }}; + + rippleAreaPosition: point(8px, 8px); + rippleAreaSize: 40px; + ripple: RippleAnimation(defaultRippleAnimation) { + color: windowBgOver; + } } -introBackPosition: point(32px, 32px); + diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index f75a11e42..435d4c61d 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -42,7 +42,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent) , _a_stage(animation(this, &IntroWidget::step_stage)) , _a_show(animation(this, &IntroWidget::step_show)) -, _back(this, new Ui::IconButton(this, st::introBackButton), base::lambda_unique(), st::introSlideDuration) +, _back(this, new Ui::IconButton(this, st::introBackButton), base::lambda(), st::introSlideDuration) , _settings(this, lang(lng_menu_settings), st::defaultBoxButton) { _back->entity()->setClickedCallback([this] { onBack(); }); _back->hideFast(); @@ -62,7 +62,7 @@ IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent) cSetPasswordRecovered(false); - _back->moveToLeft(st::introBackPosition.x(), st::introBackPosition.y()); + _back->moveToLeft(0, 0); #ifndef TDESKTOP_DISABLE_AUTOUPDATE Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onCheckUpdateStatus())); @@ -378,9 +378,9 @@ void IntroWidget::resizeEvent(QResizeEvent *e) { } void IntroWidget::updateControlsGeometry() { - _settings->moveToLeft(st::boxButtonPadding.right(), height() - st::boxButtonPadding.bottom() - _settings->height()); + _settings->moveToRight(st::boxButtonPadding.right(), st::boxButtonPadding.top()); if (_update) { - _update->moveToLeft(st::boxButtonPadding.right() + _settings->width() + st::boxButtonPadding.left(), _settings->y()); + _update->moveToRight(st::boxButtonPadding.right() + _settings->width() + st::boxButtonPadding.left(), _settings->y()); } } diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index 36072d578..ed639e01b 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -20,8 +20,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -#include "mtproto/rpc_sender.h" - namespace Ui { class IconButton; class RoundButton; diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp index 235f87acd..54d7c7afe 100644 --- a/Telegram/SourceFiles/layerwidget.cpp +++ b/Telegram/SourceFiles/layerwidget.cpp @@ -43,7 +43,7 @@ public: , _shadow(st::boxShadow) { } - void setDoneCallback(base::lambda_unique callback) { + void setDoneCallback(base::lambda &&callback) { _doneCallback = std_::move(callback); } @@ -75,7 +75,7 @@ private: QPixmap _specialLayerCache; QPixmap _layerCache; - base::lambda_unique _doneCallback; + base::lambda _doneCallback; bool _wasAnimating = false; bool _inPaintEvent = false; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index e6358c560..7d10e5c98 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1303,6 +1303,10 @@ void MainWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString &cm _history->sendBotCommand(peer, bot, cmd, replyTo); } +void MainWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) { + _history->hideSingleUseKeyboard(peer, replyTo); +} + void MainWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, const HistoryItem *msg, int row, int col) { _history->app_sendBotCallback(button, msg, row, col); } @@ -1997,7 +2001,7 @@ void MainWidget::scheduleViewIncrement(HistoryItem *item) { j.value().insert(item->id, true); } -void MainWidget::fillPeerMenu(PeerData *peer, base::lambda_unique handler)> callback) { +void MainWidget::fillPeerMenu(PeerData *peer, base::lambda &&handler)> &&callback) { callback(lang((peer->isChat() || peer->isMegagroup()) ? lng_context_view_group : (peer->isUser() ? lng_context_view_profile : lng_context_view_channel)), [peer] { Ui::showPeerProfile(peer); }); @@ -2051,8 +2055,8 @@ void MainWidget::fillPeerMenu(PeerData *peer, base::lambda_uniqueasUser()) { - callback(lang(lng_profile_clear_history), std_::move(clearHistoryHandler)); callback(lang(lng_profile_delete_conversation), std_::move(deleteAndLeaveHandler)); + callback(lang(lng_profile_clear_history), std_::move(clearHistoryHandler)); if (user->access != UserNoAccess && user != App::self()) { auto blockSubscription = MakeShared(); auto blockAction = callback(lang(user->isBlocked() ? (user->botInfo ? lng_profile_unblock_bot : lng_profile_unblock_user) : (user->botInfo ? lng_profile_block_bot : lng_profile_block_user)), [user, blockSubscription] { diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index f30bc5eb1..055586f81 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -300,6 +300,7 @@ public: void stopAnimActive(); void sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo); + void hideSingleUseKeyboard(PeerData *peer, MsgId replyTo); bool insertBotCommand(const QString &cmd, bool specialGif); void searchMessages(const QString &query, PeerData *inPeer); @@ -364,7 +365,7 @@ public: void scheduleViewIncrement(HistoryItem *item); - void fillPeerMenu(PeerData *peer, base::lambda_unique handler)> callback); + void fillPeerMenu(PeerData *peer, base::lambda &&handler)> &&callback); void gotRangeDifference(ChannelData *channel, const MTPupdates_ChannelDifference &diff); void onSelfParticipantUpdated(ChannelData *channel); diff --git a/Telegram/SourceFiles/media/media_clip_reader.h b/Telegram/SourceFiles/media/media_clip_reader.h index 925d0d3f3..5f30faacc 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.h +++ b/Telegram/SourceFiles/media/media_clip_reader.h @@ -52,7 +52,7 @@ enum ReaderSteps { class ReaderPrivate; class Reader { public: - using Callback = base::lambda_unique; + using Callback = base::lambda; enum class Mode { Gif, Video, diff --git a/Telegram/SourceFiles/media/player/media_player_cover.h b/Telegram/SourceFiles/media/player/media_player_cover.h index 0cb860ef9..d0edaae4d 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.h +++ b/Telegram/SourceFiles/media/player/media_player_cover.h @@ -43,7 +43,7 @@ class CoverWidget : public TWidget, private base::Subscriber { public: CoverWidget(QWidget *parent); - using ButtonCallback = base::lambda_unique; + using ButtonCallback = base::lambda; void setPinCallback(ButtonCallback &&callback); void setCloseCallback(ButtonCallback &&callback); diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h index 99326d196..b6fce0b30 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.h +++ b/Telegram/SourceFiles/media/player/media_player_panel.h @@ -50,7 +50,7 @@ public: void showFromOther(); void hideFromOther(); - using ButtonCallback = base::lambda_wrap; + using ButtonCallback = base::lambda_copy; void setPinCallback(ButtonCallback &&callback); void setCloseCallback(ButtonCallback &&callback); diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h index 757fdcc2e..a128964e5 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.h +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -45,7 +45,7 @@ class Widget : public TWidget, private base::Subscriber { public: Widget(QWidget *parent); - using CloseCallback = base::lambda_unique; + using CloseCallback = base::lambda; void setCloseCallback(CloseCallback &&callback); void setShadowGeometryToLeft(int x, int y, int w, int h); diff --git a/Telegram/SourceFiles/mtproto/rpc_sender.h b/Telegram/SourceFiles/mtproto/rpc_sender.h index 76839e5a1..0111d13de 100644 --- a/Telegram/SourceFiles/mtproto/rpc_sender.h +++ b/Telegram/SourceFiles/mtproto/rpc_sender.h @@ -20,8 +20,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/lambda_wrap.h" - class RPCError { public: RPCError(const MTPrpcError &error) : _code(error.c_rpc_error().verror_code.v) { @@ -834,7 +832,7 @@ struct LambdaUniqueHelper; template struct LambdaUniqueHelper { - using UniqueType = base::lambda_unique; + using UniqueType = base::lambda; }; template @@ -843,7 +841,7 @@ using LambdaGetUnique = typename LambdaUniqueHelper::UniqueType; template class RPCHandlerImplementation : public Base { protected: - using Lambda = base::lambda_unique; + using Lambda = base::lambda; using Parent = RPCHandlerImplementation; public: @@ -919,32 +917,32 @@ public: }; template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBare(std_::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBareReq(std_::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationPlain(std_::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationReq(std_::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNo(std_::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNoReq(std_::move(lambda))); } @@ -992,19 +990,19 @@ public: }; -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationPlain(std_::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationReq(std_::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationNo(std_::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_unique &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationNoReq(std_::move(lambda))); } diff --git a/Telegram/SourceFiles/observer_peer.h b/Telegram/SourceFiles/observer_peer.h index 7dd1317d0..3d301ac77 100644 --- a/Telegram/SourceFiles/observer_peer.h +++ b/Telegram/SourceFiles/observer_peer.h @@ -102,7 +102,7 @@ public: private: PeerUpdate::Flags _events; - base::lambda_unique _handler; + base::lambda _handler; }; base::Observable &PeerUpdated(); diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style index 40750a84b..117d3deda 100644 --- a/Telegram/SourceFiles/overview/overview.style +++ b/Telegram/SourceFiles/overview/overview.style @@ -43,19 +43,19 @@ OverviewFileLayout { fileDateTop: pixels; } -overviewCheckBg: #00000066; +overviewCheckBg: #00000042; overviewCheckedBg: #2fa9e2; overviewPhotoSkip: 10px; overviewPhotoBg: #F1F1F1; overviewPhotoMinSize: minPhotoSize; overviewPhotoCheck: icon { - { size(32px, 32px), overviewCheckBg }, - { "overview_photo_check", #ffffff, point(8px, 10px) }, + { size(31px, 31px), overviewCheckBg }, + { "overview_photo_check", #ffffff, point(4px, 8px) }, }; overviewPhotoChecked: icon { - { size(32px, 32px), overviewCheckedBg }, - { "overview_photo_check", #ffffff, point(8px, 10px) }, + { size(31px, 31px), overviewCheckedBg }, + { "overview_photo_check", #ffffff, point(4px, 8px) }, }; overviewPhotoSelectOverlay: #0a7bb03f; diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.h b/Telegram/SourceFiles/profile/profile_cover_drop_area.h index 063e223ea..c70d4f25e 100644 --- a/Telegram/SourceFiles/profile/profile_cover_drop_area.h +++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.h @@ -28,7 +28,7 @@ public: void showAnimated(); - using HideFinishCallback = base::lambda_unique; + using HideFinishCallback = base::lambda; void hideAnimated(HideFinishCallback &&callback); bool hiding() const { diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/settings/settings_widget.cpp index 92c3c7394..602eb7a12 100644 --- a/Telegram/SourceFiles/settings/settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_widget.cpp @@ -38,7 +38,7 @@ namespace Settings { namespace { QString SecretText; -QMap> Codes; +QMap> Codes; void fillCodes() { Codes.insert(qsl("debugmode"), []() { diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 581b0d55c..3a53d4a17 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -59,6 +59,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" #include "logs.h" #include "core/utils.h" +#include "core/lambda.h" #include "config.h" #include "mtproto/facade.h" diff --git a/Telegram/SourceFiles/stickers/emoji_pan.cpp b/Telegram/SourceFiles/stickers/emoji_pan.cpp index e8161a4f0..cdddb80f5 100644 --- a/Telegram/SourceFiles/stickers/emoji_pan.cpp +++ b/Telegram/SourceFiles/stickers/emoji_pan.cpp @@ -2845,9 +2845,17 @@ void EmojiPan::paintEvent(QPaintEvent *e) { Painter p(this); auto ms = getms(); + auto showAnimating = _a_show.animating(ms); auto opacityAnimating = _a_opacity.animating(ms); auto switching = (_slideAnimation != nullptr); - if (_a_show.animating(ms)) { + if (_showAnimation && !showAnimating) { + _showAnimation.reset(); + if (!switching && !opacityAnimating) { + showAll(); + } + } + + if (showAnimating) { if (auto opacity = _a_opacity.current(_hiding ? 0. : 1.)) { _showAnimation->paintFrame(p, 0, 0, width(), _a_show.current(1.), opacity); } @@ -2856,10 +2864,6 @@ void EmojiPan::paintEvent(QPaintEvent *e) { p.drawPixmap(0, 0, _cache); } else if ((!switching && _hiding) || isHidden()) { hideFinished(); - } else if (_showAnimation) { - _showAnimation->paintFrame(p, 0, 0, width(), 1., 1.); - _showAnimation.reset(); - if (!switching && !opacityAnimating) showAll(); } else if (switching) { auto slideDt = _a_slide.current(ms, 1.); _slideAnimation->paintFrame(p, slideDt, _a_opacity.current(_hiding ? 0. : 1.)); diff --git a/Telegram/SourceFiles/ui/abstract_button.h b/Telegram/SourceFiles/ui/abstract_button.h index 584ffc23e..59cd53445 100644 --- a/Telegram/SourceFiles/ui/abstract_button.h +++ b/Telegram/SourceFiles/ui/abstract_button.h @@ -21,7 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "ui/twidget.h" -#include "core/lambda_wrap.h" namespace Ui { @@ -61,7 +60,7 @@ public: void setAcceptBoth(bool acceptBoth = true); - void setClickedCallback(base::lambda_unique &&callback) { + void setClickedCallback(base::lambda &&callback) { _clickedCallback = std_::move(callback); } @@ -83,7 +82,7 @@ protected: int _state = StateNone; bool _acceptBoth = false; - base::lambda_unique _clickedCallback; + base::lambda _clickedCallback; }; diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index 81370ef6d..05118319e 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -21,7 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "core/basic_types.h" -#include "core/lambda_wrap.h" #include #include @@ -89,7 +88,7 @@ enum Notification { namespace anim { -using transition = base::lambda_wrap; +using transition = base::lambda_copy; extern transition linear; extern transition sineInOut; @@ -584,7 +583,7 @@ template class SimpleAnimation { public: using ValueType = typename AnimType::ValueType; - using Callback = base::lambda_unique; + using Callback = base::lambda; void step(uint64 ms) { if (_data) { @@ -621,7 +620,7 @@ public: } template - void start(Lambda &&updateCallback, const ValueType &from, const ValueType &to, float64 duration, anim::transition transition = anim::linear) { + void start(Lambda &&updateCallback, const ValueType &from, const ValueType &to, float64 duration, const anim::transition &transition = anim::linear) { if (!_data) { _data = std_::make_unique(from, std_::forward(updateCallback)); } @@ -647,10 +646,10 @@ private: , a_animation(animation(this, &Data::step)) , updateCallback(std_::move(updateCallback)) { } - Data(const ValueType &from, const base::lambda_wrap &updateCallback) + Data(const ValueType &from, const base::lambda_copy &updateCallback) : value(from, from) , a_animation(animation(this, &Data::step)) - , updateCallback(base::lambda_wrap(updateCallback)) { + , updateCallback(base::lambda_copy(updateCallback)) { } void step(float64 ms, bool timer) { auto dt = (ms >= duration) ? 1. : (ms / duration); diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp index e096d2f78..b9feb2dfd 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp @@ -25,8 +25,8 @@ namespace Ui { class RippleAnimation::Ripple { public: - Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, UpdateCallback update); - Ripple(const style::RippleAnimation &st, const QPixmap &mask, UpdateCallback update); + Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, const UpdateCallback &update); + Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update); void paint(QPainter &p, const QPixmap &mask, uint64 ms); @@ -53,7 +53,7 @@ private: }; -RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, UpdateCallback update) +RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, const UpdateCallback &update) : _st(st) , _update(update) , _origin(origin) @@ -75,7 +75,7 @@ RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, _show.start(UpdateCallback(_update), 0., 1., _st.showDuration); } -RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap &mask, UpdateCallback update) +RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update) : _st(st) , _update(update) , _origin(mask.width() / (2 * cIntRetinaFactor()), mask.height() / (2 * cIntRetinaFactor())) @@ -141,10 +141,10 @@ void RippleAnimation::Ripple::finish() { _hide.finish(); } -RippleAnimation::RippleAnimation(const style::RippleAnimation &st, QImage mask, UpdateCallback callback) +RippleAnimation::RippleAnimation(const style::RippleAnimation &st, QImage mask, const UpdateCallback &callback) : _st(st) , _mask(App::pixmapFromImageInPlace(std_::move(mask))) -, _update(std_::move(callback)) { +, _update(callback) { } @@ -190,7 +190,7 @@ void RippleAnimation::paint(QPainter &p, int x, int y, int outerWidth, uint64 ms clearFinished(); } -QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda_unique drawer) { +QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda &&drawer) { auto result = QImage(size * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); result.fill(filled ? QColor(255, 255, 255) : Qt::transparent); if (drawer) { @@ -204,7 +204,7 @@ QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda_uniqu } QImage RippleAnimation::rectMask(QSize size) { - return maskByDrawer(size, true, base::lambda_unique()); + return maskByDrawer(size, true, base::lambda()); } QImage RippleAnimation::roundRectMask(QSize size, int radius) { diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.h b/Telegram/SourceFiles/ui/effects/ripple_animation.h index b204d9967..55a558d5b 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.h +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.h @@ -26,12 +26,10 @@ namespace Ui { class RippleAnimation { public: - using UpdateCallback = base::lambda_wrap; + using UpdateCallback = base::lambda_copy; // White upon transparent mask, like colorizeImage(black-white-mask, white). - RippleAnimation(const style::RippleAnimation &st, QImage mask, UpdateCallback update); - - void setMask(QImage &&mask); + RippleAnimation(const style::RippleAnimation &st, QImage mask, const UpdateCallback &update); void add(QPoint origin, int startRadius = 0); void addFading(); @@ -45,7 +43,7 @@ public: return _ripples.isEmpty(); } - static QImage maskByDrawer(QSize size, bool filled, base::lambda_unique drawer); + static QImage maskByDrawer(QSize size, bool filled, base::lambda &&drawer); static QImage rectMask(QSize size); static QImage roundRectMask(QSize size, int radius); static QImage ellipseMask(QSize size); diff --git a/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp index ee57868d2..28b67a083 100644 --- a/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp +++ b/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp @@ -58,9 +58,9 @@ void prepareCheckCaches(const style::RoundImageCheckbox *st, QPixmap &checkBgCac } // namespace -RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda_wrap updateCallback, PaintRoundImage paintRoundImage) +RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, const base::lambda_copy &updateCallback, PaintRoundImage &&paintRoundImage) : _st(st) -, _updateCallback(std_::move(updateCallback)) +, _updateCallback(updateCallback) , _paintRoundImage(std_::move(paintRoundImage)) { prepareCheckCaches(&_st, _wideCheckBgCache, _wideCheckFullCache); } diff --git a/Telegram/SourceFiles/ui/effects/round_image_checkbox.h b/Telegram/SourceFiles/ui/effects/round_image_checkbox.h index 3b9d0f79a..67b5d91f8 100644 --- a/Telegram/SourceFiles/ui/effects/round_image_checkbox.h +++ b/Telegram/SourceFiles/ui/effects/round_image_checkbox.h @@ -26,8 +26,8 @@ namespace Ui { class RoundImageCheckbox { public: - using PaintRoundImage = base::lambda_unique; - RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda_wrap updateCallback, PaintRoundImage paintRoundImage); + using PaintRoundImage = base::lambda; + RoundImageCheckbox(const style::RoundImageCheckbox &st, const base::lambda_copy &updateCallback, PaintRoundImage &&paintRoundImage); void paint(Painter &p, uint64 ms, int x, int y, int outerWidth); float64 checkedAnimationRatio() const; @@ -52,7 +52,7 @@ private: void prepareWideCheckIconCache(Icon *icon); const style::RoundImageCheckbox &_st; - base::lambda_wrap _updateCallback; + base::lambda_copy _updateCallback; PaintRoundImage _paintRoundImage; bool _checked = false; diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp index 6175aaa58..f309937f6 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp @@ -115,7 +115,7 @@ void FadeAnimation::updateCallback() { WidgetFadeWrap::WidgetFadeWrap(QWidget *parent , TWidget *entity -, base::lambda_unique updateCallback +, base::lambda &&updateCallback , int duration) : TWidget(parent) , _entity(entity) , _duration(duration) diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h index 49214b1c2..193fe3157 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h @@ -33,10 +33,10 @@ public: bool paint(Painter &p); void refreshCache(); - using FinishedCallback = base::lambda_unique; + using FinishedCallback = base::lambda; void setFinishedCallback(FinishedCallback &&callback); - using UpdatedCallback = base::lambda_unique; + using UpdatedCallback = base::lambda; void setUpdatedCallback(UpdatedCallback &&callback); void show(); @@ -68,7 +68,7 @@ template <> class WidgetFadeWrap : public TWidget { public: WidgetFadeWrap(QWidget *parent, TWidget *entity - , base::lambda_unique updateCallback + , base::lambda &&updateCallback , int duration = st::widgetFadeDuration); void fadeOut() { @@ -105,7 +105,7 @@ protected: private: TWidget *_entity; int _duration; - base::lambda_unique _updateCallback; + base::lambda _updateCallback; FadeAnimation _animation; @@ -115,7 +115,7 @@ template class WidgetFadeWrap : public WidgetFadeWrap { public: WidgetFadeWrap(QWidget *parent, Widget *entity - , base::lambda_unique updateCallback + , base::lambda &&updateCallback , int duration = st::widgetFadeDuration) : WidgetFadeWrap(parent, entity, std_::move(updateCallback), duration) { } Widget *entity() { diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp index 125a1a5e7..5c78836c0 100644 --- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp @@ -26,7 +26,7 @@ namespace Ui { WidgetSlideWrap::WidgetSlideWrap(QWidget *parent , TWidget *entity , style::margins entityPadding -, base::lambda_unique updateCallback +, base::lambda &&updateCallback , int duration) : TWidget(parent) , _entity(entity) , _padding(entityPadding) diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h index 4675b86fb..abb463b0c 100644 --- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h @@ -32,7 +32,7 @@ class WidgetSlideWrap : public TWidget { public: WidgetSlideWrap(QWidget *parent, TWidget *entity , style::margins entityPadding - , base::lambda_unique updateCallback + , base::lambda &&updateCallback , int duration = st::widgetSlideDuration); void slideUp(); @@ -61,7 +61,7 @@ private: bool _inResizeToWidth = false; style::margins _padding; int _duration; - base::lambda_unique _updateCallback; + base::lambda _updateCallback; style::size _realSize; int _forceHeight = -1; @@ -76,7 +76,7 @@ class WidgetSlideWrap : public WidgetSlideWrap { public: WidgetSlideWrap(QWidget *parent, Widget *entity , style::margins entityPadding - , base::lambda_unique updateCallback + , base::lambda &&updateCallback , int duration = st::widgetSlideDuration) : WidgetSlideWrap(parent, entity, entityPadding, std_::move(updateCallback), duration) { } Widget *entity() { diff --git a/Telegram/SourceFiles/ui/widgets/continuous_slider.h b/Telegram/SourceFiles/ui/widgets/continuous_slider.h index 54b8f1f9a..0ea00061f 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_slider.h +++ b/Telegram/SourceFiles/ui/widgets/continuous_slider.h @@ -43,7 +43,7 @@ public: return _disabled; } - using Callback = base::lambda_unique; + using Callback = base::lambda; void setChangeProgressCallback(Callback &&callback) { _changeProgressCallback = std_::move(callback); } diff --git a/Telegram/SourceFiles/ui/widgets/discrete_slider.h b/Telegram/SourceFiles/ui/widgets/discrete_slider.h index 51c3bc1ff..0e1e783fa 100644 --- a/Telegram/SourceFiles/ui/widgets/discrete_slider.h +++ b/Telegram/SourceFiles/ui/widgets/discrete_slider.h @@ -34,7 +34,7 @@ public: void setActiveSection(int index); void setActiveSectionFast(int index); - using SectionActivatedCallback = base::lambda_unique; + using SectionActivatedCallback = base::lambda; void setSectionActivatedCallback(SectionActivatedCallback &&callback); protected: diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp index 5361c240b..8bdeb8173 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp @@ -69,7 +69,7 @@ QAction *DropdownMenu::addAction(const QString &text, const QObject *receiver, c return _menu->addAction(text, receiver, member, icon, iconOver); } -QAction *DropdownMenu::addAction(const QString &text, base::lambda_unique callback, const style::icon *icon, const style::icon *iconOver) { +QAction *DropdownMenu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std_::move(callback), icon, iconOver); } diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h index cab7f0716..7502b6292 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h @@ -31,11 +31,11 @@ public: DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda_unique callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); - void setHiddenCallback(base::lambda_unique callback) { + void setHiddenCallback(base::lambda &&callback) { _hiddenCallback = std_::move(callback); } @@ -99,7 +99,7 @@ private: void showMenu(const QPoint &p, DropdownMenu *parent, TriggeredSource source); const style::DropdownMenu &_st; - base::lambda_unique _hiddenCallback; + base::lambda _hiddenCallback; ChildWidget _menu; diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h index ebb93fe59..bf7c08e33 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h @@ -48,13 +48,13 @@ public: void otherLeave(); void hideFast(); - void setShowStartCallback(base::lambda_unique callback) { + void setShowStartCallback(base::lambda &&callback) { _showStartCallback = std_::move(callback); } - void setHideStartCallback(base::lambda_unique callback) { + void setHideStartCallback(base::lambda &&callback) { _hideStartCallback = std_::move(callback); } - void setHiddenCallback(base::lambda_unique callback) { + void setHiddenCallback(base::lambda &&callback) { _hiddenCallback = std_::move(callback); } @@ -116,9 +116,9 @@ private: QTimer _hideTimer; bool _ignoreShowEvents = false; - base::lambda_unique _showStartCallback; - base::lambda_unique _hideStartCallback; - base::lambda_unique _hiddenCallback; + base::lambda _showStartCallback; + base::lambda _hideStartCallback; + base::lambda _hiddenCallback; ChildWidget _scroll; diff --git a/Telegram/SourceFiles/ui/widgets/labels.h b/Telegram/SourceFiles/ui/widgets/labels.h index 0a50f2abf..f3abfe607 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.h +++ b/Telegram/SourceFiles/ui/widgets/labels.h @@ -74,7 +74,7 @@ public: void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk); - using ClickHandlerHook = base::lambda_unique; + using ClickHandlerHook = base::lambda; void setClickHandlerHook(ClickHandlerHook &&hook); // ClickHandlerHost interface diff --git a/Telegram/SourceFiles/ui/widgets/menu.cpp b/Telegram/SourceFiles/ui/widgets/menu.cpp index 9fc2e8b5b..7680dcb36 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/menu.cpp @@ -57,7 +57,7 @@ QAction *Menu::addAction(const QString &text, const QObject *receiver, const cha return action; } -QAction *Menu::addAction(const QString &text, base::lambda_unique callback, const style::icon *icon, const style::icon *iconOver) { +QAction *Menu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { auto action = addAction(new QAction(text, this), icon, iconOver); connect(action, SIGNAL(triggered(bool)), base::lambda_slot(action, std_::move(callback)), SLOT(action()), Qt::QueuedConnection); return action; diff --git a/Telegram/SourceFiles/ui/widgets/menu.h b/Telegram/SourceFiles/ui/widgets/menu.h index a64d03c03..1a8a94c40 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.h +++ b/Telegram/SourceFiles/ui/widgets/menu.h @@ -34,7 +34,7 @@ public: Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda_unique callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); @@ -52,33 +52,33 @@ public: using Actions = QList; Actions &actions(); - void setResizedCallback(base::lambda_unique callback) { + void setResizedCallback(base::lambda &&callback) { _resizedCallback = std_::move(callback); } - void setActivatedCallback(base::lambda_unique callback) { + void setActivatedCallback(base::lambda &&callback) { _activatedCallback = std_::move(callback); } - void setTriggeredCallback(base::lambda_unique callback) { + void setTriggeredCallback(base::lambda &&callback) { _triggeredCallback = std_::move(callback); } - void setKeyPressDelegate(base::lambda_unique delegate) { + void setKeyPressDelegate(base::lambda &&delegate) { _keyPressDelegate = std_::move(delegate); } void handleKeyPress(int key); - void setMouseMoveDelegate(base::lambda_unique delegate) { + void setMouseMoveDelegate(base::lambda &&delegate) { _mouseMoveDelegate = std_::move(delegate); } void handleMouseMove(QPoint globalPosition); - void setMousePressDelegate(base::lambda_unique delegate) { + void setMousePressDelegate(base::lambda &&delegate) { _mousePressDelegate = std_::move(delegate); } void handleMousePress(QPoint globalPosition); - void setMouseReleaseDelegate(base::lambda_unique delegate) { + void setMouseReleaseDelegate(base::lambda &&delegate) { _mouseReleaseDelegate = std_::move(delegate); } void handleMouseRelease(QPoint globalPosition); @@ -114,13 +114,13 @@ private: const style::Menu &_st; - base::lambda_unique _resizedCallback; - base::lambda_unique _activatedCallback; - base::lambda_unique _triggeredCallback; - base::lambda_unique _keyPressDelegate; - base::lambda_unique _mouseMoveDelegate; - base::lambda_unique _mousePressDelegate; - base::lambda_unique _mouseReleaseDelegate; + base::lambda _resizedCallback; + base::lambda _activatedCallback; + base::lambda _triggeredCallback; + base::lambda _keyPressDelegate; + base::lambda _mouseMoveDelegate; + base::lambda _mousePressDelegate; + base::lambda _mouseReleaseDelegate; struct ActionData { bool hasSubmenu = false; diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp index feb431e70..e2505b14f 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp +++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp @@ -36,7 +36,7 @@ constexpr int kWideScale = 3; class MultiSelect::Inner::Item { public: - Item(const style::MultiSelectItem &st, uint64 id, const QString &text, const style::color &color, PaintRoundImage paintRoundImage); + Item(const style::MultiSelectItem &st, uint64 id, const QString &text, const style::color &color, PaintRoundImage &&paintRoundImage); uint64 id() const { return _id; @@ -56,8 +56,8 @@ public: void setPosition(int x, int y, int outerWidth, int maxVisiblePadding); QRect paintArea(int outerWidth) const; - void setUpdateCallback(base::lambda_wrap updateCallback) { - _updateCallback = std_::move(updateCallback); + void setUpdateCallback(const base::lambda_copy &updateCallback) { + _updateCallback = updateCallback; } void setText(const QString &text); void paint(Painter &p, int outerWidth, uint64 ms); @@ -88,11 +88,11 @@ private: uint64 _id; struct SlideAnimation { - SlideAnimation(base::lambda_wrap updateCallback, int fromX, int toX, int y, float64 duration) + SlideAnimation(const base::lambda_copy &updateCallback, int fromX, int toX, int y, float64 duration) : fromX(fromX) , toX(toX) , y(y) { - x.start(std_::move(updateCallback), fromX, toX, duration); + x.start(updateCallback, fromX, toX, duration); } IntAnimation x; int fromX, toX; @@ -111,12 +111,12 @@ private: bool _overDelete = false; bool _active = false; PaintRoundImage _paintRoundImage; - base::lambda_wrap _updateCallback; + base::lambda_copy _updateCallback; bool _hiding = false; }; -MultiSelect::Inner::Item::Item(const style::MultiSelectItem &st, uint64 id, const QString &text, const style::color &color, PaintRoundImage paintRoundImage) +MultiSelect::Inner::Item::Item(const style::MultiSelectItem &st, uint64 id, const QString &text, const style::color &color, PaintRoundImage &&paintRoundImage) : _st(st) , _id(id) , _color(color) @@ -409,15 +409,15 @@ void MultiSelect::scrollTo(int activeTop, int activeBottom) { } } -void MultiSelect::setQueryChangedCallback(base::lambda_unique callback) { +void MultiSelect::setQueryChangedCallback(base::lambda &&callback) { _queryChangedCallback = std_::move(callback); } -void MultiSelect::setSubmittedCallback(base::lambda_unique callback) { +void MultiSelect::setSubmittedCallback(base::lambda &&callback) { _inner->setSubmittedCallback(std_::move(callback)); } -void MultiSelect::setResizedCallback(base::lambda_unique callback) { +void MultiSelect::setResizedCallback(base::lambda &&callback) { _resizedCallback = std_::move(callback); } @@ -435,11 +435,11 @@ QString MultiSelect::getQuery() const { return _inner->getQuery(); } -void MultiSelect::addItem(uint64 itemId, const QString &text, const style::color &color, PaintRoundImage paintRoundImage, AddItemWay way) { +void MultiSelect::addItem(uint64 itemId, const QString &text, const style::color &color, PaintRoundImage &&paintRoundImage, AddItemWay way) { _inner->addItem(std_::make_unique(_st.item, itemId, text, color, std_::move(paintRoundImage)), way); } -void MultiSelect::setItemRemovedCallback(base::lambda_unique callback) { +void MultiSelect::setItemRemovedCallback(base::lambda &&callback) { _inner->setItemRemovedCallback(std_::move(callback)); } @@ -456,7 +456,7 @@ int MultiSelect::resizeGetHeight(int newWidth) { return newHeight; } -MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback callback) : TWidget(parent) +MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback &&callback) : TWidget(parent) , _st(st) , _scrollCallback(std_::move(callback)) , _field(this, _st.field, placeholder) @@ -500,11 +500,11 @@ void MultiSelect::Inner::clearQuery() { _field->setText(QString()); } -void MultiSelect::Inner::setQueryChangedCallback(base::lambda_unique callback) { +void MultiSelect::Inner::setQueryChangedCallback(base::lambda &&callback) { _queryChangedCallback = std_::move(callback); } -void MultiSelect::Inner::setSubmittedCallback(base::lambda_unique callback) { +void MultiSelect::Inner::setSubmittedCallback(base::lambda &&callback) { _submittedCallback = std_::move(callback); } @@ -805,11 +805,11 @@ void MultiSelect::Inner::setItemText(uint64 itemId, const QString &text) { } } -void MultiSelect::Inner::setItemRemovedCallback(base::lambda_unique callback) { +void MultiSelect::Inner::setItemRemovedCallback(base::lambda &&callback) { _itemRemovedCallback = std_::move(callback); } -void MultiSelect::Inner::setResizedCallback(base::lambda_unique callback) { +void MultiSelect::Inner::setResizedCallback(base::lambda &&callback) { _resizedCallback = std_::move(callback); } diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.h b/Telegram/SourceFiles/ui/widgets/multi_select.h index 9f60fc9bc..496502b60 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.h +++ b/Telegram/SourceFiles/ui/widgets/multi_select.h @@ -36,19 +36,19 @@ public: void setInnerFocus(); void clearQuery(); - void setQueryChangedCallback(base::lambda_unique callback); - void setSubmittedCallback(base::lambda_unique callback); - void setResizedCallback(base::lambda_unique callback); + void setQueryChangedCallback(base::lambda &&callback); + void setSubmittedCallback(base::lambda &&callback); + void setResizedCallback(base::lambda &&callback); enum class AddItemWay { Default, SkipAnimation, }; - using PaintRoundImage = base::lambda_unique; - void addItem(uint64 itemId, const QString &text, const style::color &color, PaintRoundImage paintRoundImage, AddItemWay way = AddItemWay::Default); + using PaintRoundImage = base::lambda; + void addItem(uint64 itemId, const QString &text, const style::color &color, PaintRoundImage &&paintRoundImage, AddItemWay way = AddItemWay::Default); void setItemText(uint64 itemId, const QString &text); - void setItemRemovedCallback(base::lambda_unique callback); + void setItemRemovedCallback(base::lambda &&callback); void removeItem(uint64 itemId); protected: @@ -65,8 +65,8 @@ private: class Inner; ChildWidget _inner; - base::lambda_unique _resizedCallback; - base::lambda_unique _queryChangedCallback; + base::lambda _resizedCallback; + base::lambda _queryChangedCallback; }; @@ -75,24 +75,24 @@ class MultiSelect::Inner : public TWidget { Q_OBJECT public: - using ScrollCallback = base::lambda_unique; - Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback callback); + using ScrollCallback = base::lambda; + Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback &&callback); QString getQuery() const; bool setInnerFocus(); void clearQuery(); - void setQueryChangedCallback(base::lambda_unique callback); - void setSubmittedCallback(base::lambda_unique callback); + void setQueryChangedCallback(base::lambda &&callback); + void setSubmittedCallback(base::lambda &&callback); class Item; void addItem(std_::unique_ptr item, AddItemWay way); void setItemText(uint64 itemId, const QString &text); - void setItemRemovedCallback(base::lambda_unique callback); + void setItemRemovedCallback(base::lambda &&callback); void removeItem(uint64 itemId); - void setResizedCallback(base::lambda_unique callback); + void setResizedCallback(base::lambda &&callback); ~Inner(); @@ -159,10 +159,10 @@ private: int _newHeight = 0; IntAnimation _height; - base::lambda_unique _queryChangedCallback; - base::lambda_unique _submittedCallback; - base::lambda_unique _itemRemovedCallback; - base::lambda_unique _resizedCallback; + base::lambda _queryChangedCallback; + base::lambda _submittedCallback; + base::lambda _itemRemovedCallback; + base::lambda _resizedCallback; }; diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp index e712c0a7b..1513b690e 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp @@ -85,7 +85,7 @@ QAction *PopupMenu::addAction(const QString &text, const QObject *receiver, cons return _menu->addAction(text, receiver, member, icon, iconOver); } -QAction *PopupMenu::addAction(const QString &text, base::lambda_unique callback, const style::icon *icon, const style::icon *iconOver) { +QAction *PopupMenu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std_::move(callback), icon, iconOver); } diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.h b/Telegram/SourceFiles/ui/widgets/popup_menu.h index 9effdef10..0ab90a8e0 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.h +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.h @@ -29,7 +29,7 @@ public: PopupMenu(QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda_unique callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp index b884b24fb..eb41f76a6 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp @@ -140,7 +140,6 @@ void ScrollBar::paintEvent(QPaintEvent *e) { if (a_fullOpacity.current() == 0.) return; QPainter p(this); - auto deltal = _vertical ? _st->deltax : 0, deltar = _vertical ? _st->deltax : 0; auto deltat = _vertical ? 0 : _st->deltax, deltab = _vertical ? 0 : _st->deltax; p.setPen(Qt::NoPen); diff --git a/Telegram/SourceFiles/ui/widgets/shadow.h b/Telegram/SourceFiles/ui/widgets/shadow.h index bf1ef00b6..0f559bd24 100644 --- a/Telegram/SourceFiles/ui/widgets/shadow.h +++ b/Telegram/SourceFiles/ui/widgets/shadow.h @@ -74,7 +74,8 @@ protected: } void paintEvent(QPaintEvent *e) override { Painter p(this); - _icon.fill(p, e->rect()); + auto clip = e->rect(); + _icon.fill(p, QRect(clip.x(), 0, clip.width(), height())); } private: diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index 67307b4f9..93648bb6f 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -419,7 +419,7 @@ void Widget::hideStop() { } } -void Widget::hideAnimated(float64 duration, anim::transition func) { +void Widget::hideAnimated(float64 duration, const anim::transition &func) { _opacityDuration = duration; a_func = func; a_opacity.start(0); diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h index b6384ac62..076b0baf0 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.h +++ b/Telegram/SourceFiles/window/notifications_manager_default.h @@ -152,7 +152,7 @@ protected: private: void destroyDelayed(); void moveByShift(); - void hideAnimated(float64 duration, anim::transition func); + void hideAnimated(float64 duration, const anim::transition &func); void step_opacity(float64 ms, bool timer); void step_shift(float64 ms, bool timer); diff --git a/Telegram/SourceFiles/window/player_wrap_widget.cpp b/Telegram/SourceFiles/window/player_wrap_widget.cpp index c88269228..4c7120760 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.cpp +++ b/Telegram/SourceFiles/window/player_wrap_widget.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org namespace Window { -PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda_unique updateCallback) : Parent(parent +PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda &&updateCallback) : Parent(parent , new Media::Player::Widget(parent) , style::margins(0, 0, 0, 0) , std_::move(updateCallback)) { diff --git a/Telegram/SourceFiles/window/player_wrap_widget.h b/Telegram/SourceFiles/window/player_wrap_widget.h index 65ab56276..44719f54c 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.h +++ b/Telegram/SourceFiles/window/player_wrap_widget.h @@ -13,7 +13,7 @@ class PlayerWrapWidget : public Ui::WidgetSlideWrap { using Parent = Ui::WidgetSlideWrap; public: - PlayerWrapWidget(QWidget *parent, base::lambda_unique updateCallback); + PlayerWrapWidget(QWidget *parent, base::lambda &&updateCallback); void updateAdaptiveLayout() { updateShadowGeometry(); diff --git a/Telegram/SourceFiles/window/slide_animation.h b/Telegram/SourceFiles/window/slide_animation.h index 12f9789db..2f0a072c3 100644 --- a/Telegram/SourceFiles/window/slide_animation.h +++ b/Telegram/SourceFiles/window/slide_animation.h @@ -35,10 +35,10 @@ public: void setPixmaps(const QPixmap &oldContentCache, const QPixmap &newContentCache); void setTopBarShadow(bool enabled); - using RepaintCallback = base::lambda_unique; + using RepaintCallback = base::lambda; void setRepaintCallback(RepaintCallback &&callback); - using FinishedCallback = base::lambda_unique; + using FinishedCallback = base::lambda; void setFinishedCallback(FinishedCallback &&callback); void start(); diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp index 51ccd0d91..5fd719231 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.cpp +++ b/Telegram/SourceFiles/window/top_bar_widget.cpp @@ -126,7 +126,7 @@ void TopBarWidget::showMenu() { } }); _menuToggle->installEventFilter(_menu); - App::main()->fillPeerMenu(peer, [this](const QString &text, base::lambda_unique callback) { + App::main()->fillPeerMenu(peer, [this](const QString &text, base::lambda &&callback) { return _menu->addAction(text, std_::move(callback)); }); _menu->moveToRight(st::topBarMenuPosition.x(), st::topBarMenuPosition.y()); diff --git a/Telegram/SourceFiles/window/window_theme_warning.h b/Telegram/SourceFiles/window/window_theme_warning.h index af9529831..3f2970a03 100644 --- a/Telegram/SourceFiles/window/window_theme_warning.h +++ b/Telegram/SourceFiles/window/window_theme_warning.h @@ -33,7 +33,7 @@ class WarningWidget : public TWidget { public: WarningWidget(QWidget *parent); - void setHiddenCallback(base::lambda_unique callback) { + void setHiddenCallback(base::lambda &&callback) { _hiddenCallback = std_::move(callback); } @@ -65,7 +65,7 @@ private: ChildWidget _keepChanges; ChildWidget _revert; - base::lambda_unique _hiddenCallback; + base::lambda _hiddenCallback; }; diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 97ad3ed51..d821f2748 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -207,7 +207,7 @@ '<(src_loc)/core/click_handler.h', '<(src_loc)/core/click_handler_types.cpp', '<(src_loc)/core/click_handler_types.h', - '<(src_loc)/core/lambda_wrap.h', + '<(src_loc)/core/lambda.h', '<(src_loc)/core/observer.cpp', '<(src_loc)/core/observer.h', '<(src_loc)/core/ordered_set.h',