Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-14 16:18:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

attempt to sort out the mess in item deletion in FeedHolder widgets

Browse source
This commit is contained in:
csoler 2020-01-14 21:43:29 +01:00
parent a0b6f50b60
commit c552890459
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
35 changed files with 149 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

39
retroshare-gui/src/gui/feeds/MsgItem.cpp
View file

@ -43,7 +43,7 @@
/** Constructor */
MsgItem::MsgItem(FeedHolder *parent, uint32_t feedId, const std::string &msgId, bool isHome) :
FeedItem(NULL), mParent(parent), mFeedId(feedId), mMsgId(msgId), mIsHome(isHome)
FeedItem(parent,feedId,NULL), mMsgId(msgId), mIsHome(isHome)
{
/* Invoke the Qt Designer generated object setup routine */
setupUi(this);
@ -222,15 +222,10 @@ void MsgItem::updateItem()
}
}
void MsgItem::toggle()
{
expand(expandFrame->isHidden());
}
void MsgItem::doExpand(bool open)
{
if (mParent) {
mParent->lockLayout(this, true);
if (mFeedHolder) {
mFeedHolder->lockLayout(this, true);
}
if (open)
@ -252,8 +247,8 @@ void MsgItem::doExpand(bool open)
emit sizeChanged(this);
if (mParent) {
mParent->lockLayout(this, false);
if (mFeedHolder) {
mFeedHolder->lockLayout(this, false);
}
}
@ -266,23 +261,6 @@ void MsgItem::expandFill(bool first)
}
}
void MsgItem::removeItem()
{
#ifdef DEBUG_ITEM
std::cerr << "MsgItem::removeItem()";
std::cerr << std::endl;
#endif
mParent->lockLayout(this, true);
hide();
mParent->lockLayout(this, false);
if (mParent)
{
mParent->deleteFeedItem(this, mFeedId);
}
}
void MsgItem::gotoHome()
{
@ -315,7 +293,7 @@ void MsgItem::replyMsg()
std::cerr << "MsgItem::replyMsg()";
std::cerr << std::endl;
#endif
if (mParent)
if (mFeedHolder)
{
//mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, mMsgId);
@ -339,6 +317,11 @@ void MsgItem::playMedia()
#endif
}
void MsgItem::toggle()
{
expand(expandFrame->isHidden());
}
void MsgItem::checkMessageReadStatus()
{
if (!mCloseOnRead) {