Philipp Hörist pushed to branch master at gajim / gajim
Commits:
b2f70668 by Philipp Hörist at 2022-12-21T23:39:51+01:00
fix: ConversationView: Simplify merging messages
Simplify the logic and fix wrong merges under some conditions
- - - - -
1 changed file:
- gajim/gtk/conversation/view.py
Changes:
=====================================
gajim/gtk/conversation/view.py
=====================================
@@ -614,13 +614,8 @@ def _update_descendants(self, message: MessageRow) -> None:
if not isinstance(row, MessageRow):
return
- if message.is_mergeable(row):
- row.set_merged(True)
- continue
-
- if message.is_same_sender(row):
- row.set_merged(False)
- self._update_descendants(row)
+ merge = message.is_mergeable(row)
+ row.set_merged(merge)
return
def reduce_message_count(self, before: bool) -> bool:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/b2f70668e8d030aaeea528a62e30c4ba0d9fafae
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/b2f70668e8d030aaeea528a62e30c4ba0d9fafae
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
