diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp index b314d3009..0c537478c 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp @@ -79,7 +79,7 @@ struct NestedRestrictionLabels { second.erase( ranges::remove( second, - Flag::CreateTopics, + Flag::CreateTopics | Flag(), &RestrictionLabel::flags), end(second)); } @@ -1002,7 +1002,7 @@ std::vector AdminRightLabels( result.erase( ranges::remove( result, - Flag::ManageTopics, + Flag::ManageTopics | Flag(), &AdminRightLabel::flags), end(result)); } diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h index 77c51f750..c8ad5f1fc 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.h +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h @@ -355,6 +355,11 @@ protected: int resizeGetHeight(int newWidth) override; private: + using ScrollTopState = ListMemento::ScrollTopState; + using PointState = HistoryView::PointState; + using CursorState = HistoryView::CursorState; + using ChosenReaction = HistoryView::Reactions::ChosenReaction; + struct MouseState { MouseState(); MouseState( @@ -405,10 +410,6 @@ private: Selecting, Deselecting, }; - using ScrollTopState = ListMemento::ScrollTopState; - using PointState = HistoryView::PointState; - using CursorState = HistoryView::CursorState; - using ChosenReaction = HistoryView::Reactions::ChosenReaction; void onTouchSelect(); void onTouchScrollTimer();