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

Merge pull request #2757 from csoler/v0.6-BugFixing_30

Browse source 
bug fixing in UI
This commit is contained in:
csoler 2023-07-25 23:21:16 +02:00 • committed by GitHub
commit 4867d396fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/common/ElidedLabel.cpp
View file

@ -259,10 +259,10 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev)
} }
QLabel::mousePressEvent(ev); QLabel::mousePressEvent(ev);
if(ev->buttons()==Qt::RightButton) if(ev->buttons()==Qt::LeftButton)
emit rightClicked(ev->pos());
else
emit clicked(ev->pos()); emit clicked(ev->pos());
else if(ev->buttons()==Qt::RightButton)
emit rightClicked(ev->pos());
} }
void ElidedLabel::setTextColor(const QColor &color) void ElidedLabel::setTextColor(const QColor &color)

4
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View file

@ -1176,10 +1176,10 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId)
*/ */
QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString())); QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString()));
if (!item)
return;
if (item)
ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread); ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread);
mCachedGroupStats[groupId] = stats; mCachedGroupStats[groupId] = stats;
getUserNotify()->updateIcon(); getUserNotify()->updateIcon();

1
retroshare-gui/src/gui/gxs/GxsUserNotify.h
View file

@ -46,7 +46,6 @@ protected:
bool mCountChildMsgs; // Count new child messages? bool mCountChildMsgs; // Count new child messages?
private: private:
RsGxsUpdateBroadcastBase *mBase;
const GxsGroupFrameDialog *mGroupFrameDialog; const GxsGroupFrameDialog *mGroupFrameDialog;
unsigned int mNewThreadMessageCount; unsigned int mNewThreadMessageCount;

4
retroshare-gui/src/gui/statistics/Histogram.cpp
View file

@ -39,9 +39,9 @@ void Histogram::draw(QPainter */*painter*/) const
void Histogram::insert(double val) 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]; ++mBins[bin];
} }

2
retroshare-gui/src/gui/statistics/Histogram.h
View file

@ -20,7 +20,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <stdint.h> #include <cstdint>
class QPainter; class QPainter;