UserListModel: Indicate in the tooltip that a user is bridged; update to the latest lib

KitsuneRal · KitsuneRal · commit f80f51d08b65 · 2018-04-27T15:39:02.000+09:00
diff --git a/client/models/userlistmodel.cpp b/client/models/userlistmodel.cpp
@@ -104,8 +104,11 @@ QVariant UserListModel::data(const QModelIndex& index, int role) const
 
     if (role == Qt::ToolTipRole)
     {
-        return QStringLiteral("<b>%1</b><br>%2")
+        auto tooltip = QStringLiteral("<b>%1</b><br>%2")
                 .arg(user->name(m_currentRoom), user->id());
+        if (!user->bridged().isEmpty())
+            tooltip += tr("<br>Bridged from: %1").arg(user->bridged());
+        return tooltip;
     }
 
     return QVariant();
diff --git a/lib b/lib
@@ -1 +1 @@
-Subproject commit 698d41f191b9a7dd2c5c1662c5f5bd6b7c2697f6
+Subproject commit f5af25428212f139c59941bb294a184242c8b5e0

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,11 @@ QVariant UserListModel::data(const QModelIndex& index, int role) const`
`104`	`104`
`105`	`105`	`if (role == Qt::ToolTipRole)`
`106`	`106`	`{`
`107`		`- return QStringLiteral("<b>%1</b><br>%2")`
	`107`	`+ auto tooltip = QStringLiteral("<b>%1</b><br>%2")`
`108`	`108`	`.arg(user->name(m_currentRoom), user->id());`
	`109`	`+ if (!user->bridged().isEmpty())`
	`110`	`+ tooltip += tr("<br>Bridged from: %1").arg(user->bridged());`
	`111`	`+ return tooltip;`
`109`	`112`	`}`
`110`	`113`
`111`	`114`	`return QVariant();`