Merge de87f22684 into 90211cca55

revert publicizing shouldIncludeMessage from channelview
Merge branch 'master' into master
2024-11-21 22:24:07 +01:00 · 2024-10-28 19:12:40 +00:00 · 2024-10-28 20:12:28 +01:00 · 2024-10-28 17:46:54 +01:00
1 changed files with 3 additions and 3 deletions
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@ -179,9 +179,6 @@ public:

    LimitedQueueSnapshot<MessageLayoutPtr> &getMessagesSnapshot();

-    // Returns true if message should be included
-    bool shouldIncludeMessage(const MessagePtr &message) const;
-
    void queueLayout();
    void invalidateBuffers();

@ -388,6 +385,9 @@ private:

    FilterSetPtr channelFilters_;

+    // Returns true if message should be included
+    bool shouldIncludeMessage(const MessagePtr &message) const;
+
    // Returns whether the scrollbar should have highlights
    bool showScrollbarHighlights() const;
Author	SHA1	Message	Date
hemirt	90c7252829	Merge `de87f22684` into `90211cca55`	2024-10-28 19:12:40 +00:00
unknown	de87f22684	revert publicizing shouldIncludeMessage from channelview	2024-10-28 20:12:28 +01:00
pajlada	21e1df0f7c	Merge branch 'master' into master	2024-10-28 17:46:54 +01:00