From 7a4558a3dac121ff430fc0af91185d290c9ca2d7 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 24 Jul 2023 18:35:05 +0200 Subject: [PATCH 1/3] added missing change in previous commit --- retroshare-gui/src/gui/common/ElidedLabel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/common/ElidedLabel.cpp b/retroshare-gui/src/gui/common/ElidedLabel.cpp index bd86be9bd..2486d0cae 100644 --- a/retroshare-gui/src/gui/common/ElidedLabel.cpp +++ b/retroshare-gui/src/gui/common/ElidedLabel.cpp @@ -259,10 +259,10 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev) } QLabel::mousePressEvent(ev); - if(ev->buttons()==Qt::RightButton) - emit rightClicked(ev->pos()); - else + if(ev->buttons()==Qt::LeftButton) emit clicked(ev->pos()); + else if(ev->buttons()==Qt::RightButton) + emit rightClicked(ev->pos()); } void ElidedLabel::setTextColor(const QColor &color) From 15128192003722a3686c1b6f27132ba064cd1705 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 24 Jul 2023 18:35:21 +0200 Subject: [PATCH 2/3] fixed compilation on arch --- retroshare-gui/src/gui/statistics/Histogram.cpp | 4 ++-- retroshare-gui/src/gui/statistics/Histogram.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/statistics/Histogram.cpp b/retroshare-gui/src/gui/statistics/Histogram.cpp index 5884d8306..77e272b31 100644 --- a/retroshare-gui/src/gui/statistics/Histogram.cpp +++ b/retroshare-gui/src/gui/statistics/Histogram.cpp @@ -39,9 +39,9 @@ void Histogram::draw(QPainter */*painter*/) const void Histogram::insert(double val) { - long int bin = (uint32_t)floor((val - mStart)/(mEnd - mStart) * mBins.size()); + long int bin = (long int)floor((val - mStart)/(mEnd - mStart) * mBins.size()); - if(bin >= 0 && bin < mBins.size()) + if(bin >= 0 && bin < (long int)mBins.size()) ++mBins[bin]; } diff --git a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h index 91ec84b5d..3931b15db 100644 --- a/retroshare-gui/src/gui/statistics/Histogram.h +++ b/retroshare-gui/src/gui/statistics/Histogram.h @@ -20,7 +20,7 @@ #include #include -#include +#include class QPainter; From ade297f257e93e52fac5c5b55d320b5b979ec9ea Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 24 Jul 2023 23:45:12 +0200 Subject: [PATCH 3/3] attempt at fixing unread msg count to display before GXS service tab is displayed --- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 6 +++--- retroshare-gui/src/gui/gxs/GxsUserNotify.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index ca8521ca5..9d8d66d61 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -1176,10 +1176,10 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId) */ QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString())); - if (!item) - return; - ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread); + if (item) + ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread); + mCachedGroupStats[groupId] = stats; getUserNotify()->updateIcon(); diff --git a/retroshare-gui/src/gui/gxs/GxsUserNotify.h b/retroshare-gui/src/gui/gxs/GxsUserNotify.h index cfbec97be..66890a1c3 100644 --- a/retroshare-gui/src/gui/gxs/GxsUserNotify.h +++ b/retroshare-gui/src/gui/gxs/GxsUserNotify.h @@ -46,7 +46,6 @@ protected: bool mCountChildMsgs; // Count new child messages? private: - RsGxsUpdateBroadcastBase *mBase; const GxsGroupFrameDialog *mGroupFrameDialog; unsigned int mNewThreadMessageCount;