Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 13:24:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed comments to open the Post & fixed background selection color issue on Fusion style

Browse source 
* Fixed Comments Button to open the Post
* Fixed background selection color issue on Fusion style
* Fixed issue when exapnding the Notes Text
This commit is contained in:
defnax 2020-12-06 15:10:50 +01:00
parent e5c9c47c91
commit 5341db5afe
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/Posted/PostedItem.cpp
View file

@ -35,6 +35,7 @@
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
#include "gui/Identity/IdDialog.h" #include "gui/Identity/IdDialog.h"
#include "PhotoView.h" #include "PhotoView.h"
#include "gui/Posted/PostedDialog.h"
#include "ui_PostedItem.h" #include "ui_PostedItem.h"
#include <retroshare/rsposted.h> #include <retroshare/rsposted.h>
@ -266,14 +267,14 @@ void BasePostedItem::loadComments()
if (mFeedHolder) if (mFeedHolder)
{ {
QString title = QString::fromUtf8(mPost.mMeta.mMsgName.c_str()); /* window will destroy itself! */
PostedDialog *postedDialog = dynamic_cast<PostedDialog*>(MainWindow::getPage(MainWindow::Posted));
#warning (csoler) Posted item versions not handled yet. When it is the case, start here. if (!postedDialog)
return ;
QVector<RsGxsMessageId> post_versions ; MainWindow::showWindow(MainWindow::Posted);
post_versions.push_back(mPost.mMeta.mMsgId) ; postedDialog->navigate(mPost.mMeta.mGroupId, mPost.mMeta.mMsgId) ;
mFeedHolder->openComments(0, mPost.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId, title);
} }
} }
void BasePostedItem::readToggled(bool checked) void BasePostedItem::readToggled(bool checked)
@ -740,4 +741,5 @@ void PostedItem::toggleNotes()
ui->frame_notes->hide(); ui->frame_notes->hide();
} }
emit sizeChanged(this);
} }

9
retroshare-gui/src/gui/Posted/PostedItem.ui
View file

@ -611,6 +611,9 @@
<height>600</height> <height>600</height>
</size> </size>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -662,6 +665,9 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QFrame" name="frame_notes"> <widget class="QFrame" name="frame_notes">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::Box</enum>
</property> </property>
@ -686,6 +692,9 @@
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="notes"> <widget class="QLabel" name="notes">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>