Prevent ChatView from scrolling up 1px on buffer switch, fixes #544

[quassel.git] / src / client / backlogrequester.h

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index 4ddc962..c3c6832 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,9 +34,9 @@ class BacklogRequester {
 public:
   enum RequesterTypes {
     InvalidRequester = 0,
-    GlobalUnread,
+    PerBufferFixed,
     PerBufferUnread,
-    PerBufferFixed
+    GlobalUnread
   };
 
   BacklogRequester(bool buffering, ClientBacklogManager *backlogManger);
@@ -45,6 +45,8 @@ public:
   inline bool isBuffering() { return _isBuffering; }
   inline const QList<Message> &bufferedMessages() { return _bufferedMessages; }
 
+  inline int buffersWaiting() const { return _buffersWaiting.count(); }
+  inline int totalBuffers() const { return _totalBuffers; }
   //! returns false if it was the last missing backlogpart
   bool buffer(BufferId bufferId, const MessageList &messages);
   
@@ -52,15 +54,16 @@ public:
 
 protected:
   inline QList<BufferId> allBufferIds() const { return Client::networkModel()->allBufferIds(); }
-  inline void setWaitingBuffers(const QList<BufferId> &buffers) { _buffersWaiting = buffers.toSet(); }
-  inline void setWaitingBuffers(const QSet<BufferId> &buffers) { _buffersWaiting = buffers; }
-  inline void addWaitingBuffer(BufferId buffer) { _buffersWaiting << buffer; }
+  inline void setWaitingBuffers(const QList<BufferId> &buffers) { setWaitingBuffers(buffers.toSet()); }
+  void setWaitingBuffers(const QSet<BufferId> &buffers);
+  void addWaitingBuffer(BufferId buffer);
 
   ClientBacklogManager *backlogManager;
 
 private:
   bool _isBuffering;
   MessageList _bufferedMessages;
+  int _totalBuffers;
   QSet<BufferId> _buffersWaiting;
 };