Fixed "jumping" of the items in channels and news feed when items are changed (load, toggle and remove).

Added workaround for QTBUG-3372.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5650 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/ChannelFeed.cpp

@@ -225,6 +225,11 @@ void ChannelFeed::createChannel()
 /*************************************************************************************/
 /*************************************************************************************/
 
+QScrollArea *ChannelFeed::getScrollArea()
+{
+	return scrollArea;
+}
+
 void ChannelFeed::deleteFeedItem(QWidget */*item*/, uint32_t /*type*/)
 {
 }
@@ -587,9 +592,14 @@ void ChannelFeed::fillThreadAddMsg(const QString &channelId, const QString &chan
             progressBar->setValue(current * progressBar->maximum() / count);
         }
 
+        lockLayout(NULL, true);
+
         ChanMsgItem *cmi = new ChanMsgItem(this, 0, channelId.toStdString(), channelMsgId.toStdString(), true);
         mChanMsgItems.push_back(cmi);
         verticalLayout->addWidget(cmi);
+        cmi->show();
+
+        lockLayout(cmi, false);
     }
 }
 

retroshare-gui/src/gui/ChannelFeed.h

@@ -50,6 +50,8 @@ public:
 
     virtual UserNotify *getUserNotify(QObject *parent);
 
+    /* FeedHolder */
+    virtual QScrollArea *getScrollArea();
     virtual void deleteFeedItem(QWidget *item, uint32_t type);
     virtual void openChat(std::string peerId);
 

retroshare-gui/src/gui/ChannelFeed.ui

@@ -229,14 +229,6 @@
           <bool>true</bool>
          </property>
          <widget class="QWidget" name="scrollAreaWidgetContents">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>413</width>
-            <height>16</height>
-           </rect>
-          </property>
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>

retroshare-gui/src/gui/NewsFeed.cpp

@@ -400,11 +400,16 @@ void NewsFeed::addFeedItem(QWidget *item)
 
 	sendNewsFeedChanged();
 
+	lockLayout(NULL, true);
+
 	if (Settings->getAddFeedsAtEnd()) {
 		verticalLayout->addWidget(item);
 	} else {
 		verticalLayout->insertWidget(0, item);
 	}
+	item->show();
+
+	lockLayout(item, false);
 }
 
 void NewsFeed::addFeedItemIfUnique(QWidget *item, int itemType, const std::string &sslId, bool replace)
@@ -742,6 +747,11 @@ void	NewsFeed::addFeedItemFilesNew(RsFeedItem &/*fi*/)
 }
 
 /* FeedHolder Functions (for FeedItem functionality) */
+QScrollArea *NewsFeed::getScrollArea()
+{
+	return scrollArea;
+}
+
 void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/)
 {
 #ifdef NEWS_DEBUG

retroshare-gui/src/gui/NewsFeed.h

@@ -43,6 +43,7 @@ public:
   virtual ~NewsFeed();
 
 	/* FeedHolder Functions (for FeedItem functionality) */
+  virtual QScrollArea *getScrollArea();
   virtual void deleteFeedItem(QWidget *item, uint32_t type);
   virtual void openChat(std::string peerId);
 

retroshare-gui/src/gui/feeds/BlogMsgItem.cpp

@@ -129,6 +129,8 @@ void BlogMsgItem::small()
 
 void BlogMsgItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -141,6 +143,8 @@ void BlogMsgItem::toggle()
 	    expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 	    expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 
@@ -150,7 +154,11 @@ void BlogMsgItem::removeItem()
 	std::cerr << "BlogMsgItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/BlogNewItem.cpp

@@ -140,6 +140,8 @@ void BlogNewItem::small()
 
 void BlogNewItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -152,6 +154,8 @@ void BlogNewItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 	    expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 
@@ -161,7 +165,11 @@ void BlogNewItem::removeItem()
 	std::cerr << "BlogNewItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/ChanMsgItem.cpp

@@ -317,6 +317,8 @@ void ChanMsgItem::updateItem()
 
 void ChanMsgItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -331,6 +333,8 @@ void ChanMsgItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 void ChanMsgItem::removeItem()
@@ -339,7 +343,11 @@ void ChanMsgItem::removeItem()
 	std::cerr << "ChanMsgItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/ChanNewItem.cpp

@@ -140,6 +140,8 @@ void ChanNewItem::small()
 
 void ChanNewItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -152,6 +154,8 @@ void ChanNewItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 	    expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 
@@ -161,7 +165,11 @@ void ChanNewItem::removeItem()
 	std::cerr << "ChanNewItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/ChatMsgItem.cpp

@@ -160,7 +160,11 @@ void ChatMsgItem::removeItem()
 	std::cerr << "ChatMsgItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);
@@ -216,6 +220,8 @@ void ChatMsgItem::openChat()
 
 void ChatMsgItem::togglequickmessage()
 {
+	mParent->lockLayout(this, true);
+
 	if (messageFrame->isHidden())
 	{
 		messageFrame->setVisible(true);
@@ -229,6 +235,7 @@ void ChatMsgItem::togglequickmessage()
         cancelButton->hide();
     }	
 
+    mParent->lockLayout(this, false);
 }
 
 void ChatMsgItem::sendMessage()

retroshare-gui/src/gui/feeds/FeedHolder.cpp

@@ -0,0 +1,80 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2012 RetroShare Team
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include <QLayout>
+#include <QApplication>
+#include <QScrollArea>
+
+#include "FeedHolder.h"
+
+/** Constructor */
+FeedHolder::FeedHolder()
+{
+	mLockCount = 0;
+}
+
+// Workaround for QTBUG-3372
+void FeedHolder::lockLayout(QWidget *feedItem, bool lock)
+{
+	if (lock) {
+		if (mLockCount == 0) {
+			QScrollArea *scrollArea = getScrollArea();
+			if (scrollArea) {
+				// disable update
+				scrollArea->setUpdatesEnabled(false);
+
+				QWidget *widget = scrollArea->widget();
+				if (widget && widget->layout()) {
+					// disable layout
+					widget->layout()->setEnabled(false);
+				}
+			}
+		}
+		++mLockCount;
+	} else {
+		--mLockCount;
+		if (mLockCount == 0) {
+			QScrollArea *scrollArea = getScrollArea();
+			if (scrollArea) {
+				if (feedItem && !feedItem->isHidden()) {
+					// show window without hide it
+					// something in show causes a recalculation of the layout
+					feedItem->setAttribute(Qt::WA_WState_Hidden, true);
+					feedItem->show();
+				}
+
+				// enable update
+				scrollArea->setUpdatesEnabled(true);
+
+				// recalculate layout
+				QWidget *widget = scrollArea->widget();
+				if (widget && widget->layout()) {
+					// enable layout
+					widget->layout()->setEnabled(true);
+				}
+
+				// send layout request (without event queue) but with the newly calculated sizeHint from the call to :show
+				QApplication::sendEvent(scrollArea, new QEvent(QEvent::LayoutRequest));
+			}
+		}
+		mLockCount = qMax(mLockCount, 0);
+	}
+}

retroshare-gui/src/gui/feeds/FeedHolder.h

@@ -25,16 +25,22 @@
 #include <string>
 #include <stdint.h>
 
-const uint32_t FEEDHOLDER_MSG_MESSAGE	= 0x0001;
+class QScrollArea;
-const uint32_t FEEDHOLDER_MSG_FORUM		= 0x0002;
-const uint32_t FEEDHOLDER_MSG_CHANNEL	= 0x0003;
-const uint32_t FEEDHOLDER_MSG_BLOG		= 0x0004;
 
 class FeedHolder
 {
 public:
+	FeedHolder();
+
+	virtual QScrollArea *getScrollArea() = 0;
 	virtual void deleteFeedItem(QWidget *item, uint32_t type) = 0;
 	virtual	void openChat(std::string peerId) = 0;
+
+	// Workaround for QTBUG-3372
+	void lockLayout(QWidget *feedItem, bool lock);
+
+protected:
+	int mLockCount;
 };
 
 #endif

retroshare-gui/src/gui/feeds/ForumMsgItem.cpp

@@ -252,6 +252,8 @@ void ForumMsgItem::small()
 
 void ForumMsgItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (prevFrame->isHidden())
 	{
 		prevFrame->show();
@@ -277,6 +279,8 @@ void ForumMsgItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 void ForumMsgItem::removeItem()
@@ -285,7 +289,11 @@ void ForumMsgItem::removeItem()
 	std::cerr << "ForumMsgItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/ForumNewItem.cpp

@@ -123,7 +123,6 @@ void ForumNewItem::updateItem()
 
 }
 
-
 void ForumNewItem::small()
 {
 	expandFrame->hide();
@@ -131,6 +130,8 @@ void ForumNewItem::small()
 
 void ForumNewItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -143,8 +144,9 @@ void ForumNewItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		expandButton->setToolTip(tr("Expand"));
 	}
-}
 
+	mParent->lockLayout(this, false);
+}
 
 void ForumNewItem::removeItem()
 {
@@ -152,7 +154,11 @@ void ForumNewItem::removeItem()
 	std::cerr << "ForumNewItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/MsgItem.cpp

@@ -196,6 +196,8 @@ void MsgItem::small()
 
 void MsgItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -208,6 +210,8 @@ void MsgItem::toggle()
         expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
         expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 
@@ -217,7 +221,11 @@ void MsgItem::removeItem()
 	std::cerr << "MsgItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/PeerItem.cpp

@@ -215,6 +215,8 @@ void PeerItem::small()
 
 void PeerItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -227,6 +229,8 @@ void PeerItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 
@@ -236,7 +240,11 @@ void PeerItem::removeItem()
 	std::cerr << "PeerItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/gui/feeds/SecurityItem.cpp

@@ -191,8 +191,8 @@ void SecurityItem::updateItem()
 				connLabel->setText(tr("Unknown Peer"));
 
 				chatButton->hide();
-				quickmsgButton->hide();
+				quickmsgButton->hide();
-				requestLabel->hide();
+				requestLabel->hide();
 
 
                 removeFriendButton->setEnabled(false);
@@ -281,6 +281,8 @@ void SecurityItem::small()
 
 void SecurityItem::toggle()
 {
+	mParent->lockLayout(this, true);
+
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
@@ -293,6 +295,8 @@ void SecurityItem::toggle()
 		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		expandButton->setToolTip(tr("Expand"));
 	}
+
+	mParent->lockLayout(this, false);
 }
 
 void SecurityItem::removeItem()
@@ -301,7 +305,11 @@ void SecurityItem::removeItem()
 	std::cerr << "SecurityItem::removeItem()";
 	std::cerr << std::endl;
 #endif
+
+	mParent->lockLayout(this, true);
 	hide();
+	mParent->lockLayout(this, false);
+
 	if (mParent)
 	{
 		mParent->deleteFeedItem(this, mFeedId);

retroshare-gui/src/retroshare-gui.pro

@@ -688,6 +688,7 @@ SOURCES +=  main.cpp \
             gui/elastic/node.cpp \
             gui/NewsFeed.cpp \
             gui/ChannelFeed.cpp \
+            gui/feeds/FeedHolder.cpp \
             gui/feeds/ForumNewItem.cpp \
             gui/feeds/ForumMsgItem.cpp \
             gui/feeds/PeerItem.cpp \