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

gui: rspermissionmatrixwidget: fix name.length check with proper number

Browse source
This commit is contained in:
chelovechishko 2019-02-16 23:32:00 +09:00
parent 5009a4e243
commit 55ff018166
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View file

@ -220,7 +220,7 @@ bool sortRsPeerIdByNameLocation(const RsPeerId &a, const RsPeerId &b)
return stringA.toLower() < stringB.toLower(); return stringA.toLower() < stringB.toLower();
} }
/** Overloads default QWidget::paintEvent. Draws the actual /** Overloads default QWidget::paintEvent. Draws the actual
* bandwidth graph. */ * bandwidth graph. */
void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
{ {
@ -230,14 +230,14 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
/* Set current graph dimensions */ /* Set current graph dimensions */
_rec = this->frameRect(); _rec = this->frameRect();
/* Start the painter */ /* Start the painter */
_painter->begin(this); _painter->begin(this);
/* We want antialiased lines and text */ /* We want antialiased lines and text */
_painter->setRenderHint(QPainter::Antialiasing); _painter->setRenderHint(QPainter::Antialiasing);
_painter->setRenderHint(QPainter::TextAntialiasing); _painter->setRenderHint(QPainter::TextAntialiasing);
/* Fill in the background */ /* Fill in the background */
_painter->fillRect(_rec, QBrush(BACK_COLOR)); _painter->fillRect(_rec, QBrush(BACK_COLOR));
_painter->drawRect(_rec); _painter->drawRect(_rec);
@ -289,7 +289,8 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
rsPeers->getPeerDetails(*it,details) ; rsPeers->getPeerDetails(*it,details) ;
QString name = QString::fromUtf8(details.name.c_str()) + " (" + QString::fromUtf8(details.location.c_str()) + ")"; QString name = QString::fromUtf8(details.name.c_str()) + " (" + QString::fromUtf8(details.location.c_str()) + ")";
if(name.length() > 20) // TODO does not work correctly with hieroglyphs
if(name.length() > 20 + 3)
name = name.left(20)+"..." ; name = name.left(20)+"..." ;
peer_name_size = std::max(peer_name_size, fm.width(name)) ; peer_name_size = std::max(peer_name_size, fm.width(name)) ;