Skip to content

GUI: Fix PR3184 bugs (icon distortion, memory leak, nickname refresh) and optimize cache #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
defnax merged 1 commit into from
Mar 12, 2026
Merged

GUI: Fix PR3184 bugs (icon distortion, memory leak, nickname refresh) and optimize cache #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 26 additions & 32 deletions retroshare-gui/src/gui/Identity/IdDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*******************************************************************************/

#include <unistd.h>
#include <memory>

#include <QCheckBox>
#include <QMessageBox>
Expand Down Expand Up @@ -602,35 +603,22 @@ void IdDialog::updateCircles()
{
RsThread::async([this]()
{
// 1 - get message data from p3GxsForums

#ifdef DEBUG_FORUMS
std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif

/* This can be big so use a smart pointer to just copy the pointer
* instead of copying the whole list accross the lambdas */
auto circle_metas = new std::list<RsGroupMetaData>();
/* Use shared_ptr to avoid memory leaks if the dialog is destroyed before the callback */
auto circle_metas = std::make_shared<std::list<RsGroupMetaData>>();

if(!rsGxsCircles->getCirclesSummaries(*circle_metas))
{
RS_ERR("failed to retrieve circles group info list");
delete circle_metas;
return;
}

RsQThreadUtils::postToObject( [circle_metas, this]()
RsQThreadUtils::postToObject( [circle_metas, this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */

loadCircles(*circle_metas);

delete circle_metas;
}, this );

});
if (isVisible()) {
loadCircles(*circle_metas);
}
}, this );
});
}

static QTreeWidgetItem *setChildItem(QTreeWidgetItem *item, const RsGroupMetaData& circle_group)
Expand Down Expand Up @@ -671,7 +659,7 @@ static QTreeWidgetItem *setChildItem(QTreeWidgetItem *item, const RsGroupMetaDat
QTreeWidgetItem *subitem = new QTreeWidgetItem();

QPixmap pixmap ;
pixmap = GxsIdDetails::makeColoredGroupIcon( circle_group.mGroupId, ":/icons/png/people2.png", GxsIdDetails::ORIGINAL);
pixmap = GxsIdDetails::makeColoredGroupIcon( circle_group.mGroupId, ":/icons/png/people2.png", GxsIdDetails::MEDIUM);

subitem->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, pixmap);
subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QString::fromUtf8(circle_group.mGroupName.c_str()));
Expand Down Expand Up @@ -946,8 +934,24 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
new_sub_items.push_back(subitem);
}
else
{
subitem = item->child(subitem_index);

// Update Nickname and Icon even if it already exists
RsIdentityDetails idd ;
if (rsIdentity->getIdDetails(it->first, idd))
{
QPixmap pixmap ;
if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap, GxsIdDetails::MEDIUM))
pixmap = GxsIdDetails::makeDefaultIcon(it->first, GxsIdDetails::MEDIUM) ;

subitem->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, pixmap);

QString nickname = QString::fromUtf8(idd.mNickname.c_str());
subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, nickname.isEmpty() ? tr("[Unknown]") : nickname);
}
}

if(invited && !subscrb)
{
subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPID, tr("Invited")) ;
Expand All @@ -974,16 +978,6 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)

// add all items
item->addChildren(new_sub_items);

// The bullet colors below are for the *Membership*. This is independent from admin rights, which cannot be shown as a color.
// Admin/non admin is shows using Bold font.

/*if(am_I_in_circle)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,FilesDefs::getIconFromQtResourcePath(IMAGE_MEMBER)) ;
else if(am_I_invited || am_I_pending)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,FilesDefs::getIconFromQtResourcePath(IMAGE_INVITED)) ;
else
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,FilesDefs::getIconFromQtResourcePath(IMAGE_UNKNOWN)) ;*/
}
ui->treeWidget_membership->setSortingEnabled(true);

Expand Down
12 changes: 8 additions & 4 deletions retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@ QPixmap GxsIdDetails::generateColoredIcon(const QString& idStr, const QString& i

// Use hash to determine hue (0-359), with fixed saturation and lightness for pastel look
int hue = hash % 360;
int saturation = 150; // Mid saturation for pastel colors
int lightness = 180; // Light for pastel colors
int saturation = 200; // Consistent saturation
int lightness = 150; // Consistent lightness

QColor backgroundColor = QColor::fromHsl(hue, saturation, lightness);

Expand Down Expand Up @@ -1450,10 +1450,14 @@ const QPixmap GxsIdDetails::makeColoredGroupIcon(const RsGxsGroupId& id, const Q
result.fill(Qt::transparent);

QPainter painter(&result);
painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
painter.setRenderHint(QPainter::SmoothPixmapTransform);

// Scale and draw
painter.drawPixmap(result.rect(), sourceIcon.scaled(S, S, Qt::KeepAspectRatio, Qt::SmoothTransformation));
// Scale and draw centered to avoid distortion
QPixmap scaledIcon = sourceIcon.scaled(S, S, Qt::KeepAspectRatio, Qt::SmoothTransformation);
int x = (S - scaledIcon.width()) / 2;
int y = (S - scaledIcon.height()) / 2;
painter.drawPixmap(x, y, scaledIcon);

// Apply color only to the icon's shape
painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
Expand Down
Loading