Merge branch 'master' into contact_dialog

[situare] / src / ui / friendlistitem.cpp

diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp
index ad48d3a..9a8c67a 100644 (file)
--- a/src/ui/friendlistitem.cpp
+++ b/src/ui/friendlistitem.cpp
@@ -48,6 +48,11 @@ GeoCoordinate FriendListItem::coordinates() const
     return m_coordinates;
 }
 
+QString FriendListItem::facebookId() const
+{
+    return m_facebookId;
+}
+
 void FriendListItem::setAvatarImage(const QPixmap &image)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -85,6 +90,13 @@ void FriendListItem::setDistanceIcon(double value, const QString &unit)
     setData(DISTANCE_IMAGE_INDEX, distanceImage);
 }
 
+
+void FriendListItem::setFacebookId(const QString &facebookId)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_facebookId = facebookId;
+}
 void FriendListItem::setUserData(User *user)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -96,6 +108,8 @@ void FriendListItem::setUserData(User *user)
     setData(DISTANCE_TEXT_DISPLAY_INDEX, distanceText);
     setDistanceIcon(value, unit);
 
+    setFacebookId(user->userId());
+
     //Dummy value to get painter font metrics.
     QPixmap p = QPixmap(ICON_WIDTH, ICON_HEIGHT);
     QPainter painter(&p);
@@ -104,7 +118,7 @@ void FriendListItem::setUserData(User *user)
     QRect distanceRect = distanceTextFontMetrics.boundingRect(distanceText);
 
     setData(DISTANCE_SIZE_HINT_INDEX, distanceRect);
-    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() + MARGIN,
+    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() - MARGIN * 2,
                         ListItem::TEXT_SIZE_NORMAL));
     setCoordinates(user->coordinates());