mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-16 03:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

ui: Pull out identical code in different branches

Browse Source
This commit is contained in:
Jonas Platte
2023-07-18 10:47:28 +02:00
committed by Jonas Platte
parent 78ebb7f745
commit ab0d88ae3a
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/matrix-sdk-ui/src/timeline/event_handler.rs
View File

@@ -923,19 +923,14 @@ impl<'a> TimelineEventHandler<'a> {
} else {
// If there is no event item, there is no day divider yet.
trace!("Adding first day divider (remote)");
let new_day_divider = new_timeline_item(
VirtualTimelineItem::DayDivider(timestamp),
self.next_internal_id,
);
if should_push {
self.items.push_back(new_timeline_item(
VirtualTimelineItem::DayDivider(timestamp),
self.next_internal_id,
));
self.items.push_back(new_day_divider);
} else {
self.items.insert(
insert_idx,
new_timeline_item(
VirtualTimelineItem::DayDivider(timestamp),
self.next_internal_id,
),
);
self.items.insert(insert_idx, new_day_divider);
insert_idx += 1;
}
}
@@ -951,10 +946,11 @@ impl<'a> TimelineEventHandler<'a> {
}
trace!("Adding new remote timeline item after all non-pending events");
let new_item = new_timeline_item(item, self.next_internal_id);
if should_push {
self.items.push_back(new_timeline_item(item, self.next_internal_id));
self.items.push_back(new_item);
} else {
self.items.insert(insert_idx, new_timeline_item(item, self.next_internal_id));
self.items.insert(insert_idx, new_item);
}
}