Matrix: align messages from users with no avatar to the same x as users with avatar

1 files changed, 5 insertions, 1 deletions

diff --git a/src/Body.cpp b/src/Body.cpp
index a5a8eed..36c5b1b 100644
--- a/src/Body.cpp
+++ b/src/Body.cpp
@@ -1009,9 +1009,11 @@ namespace QuickMedia {
                 window.draw(loading_icon);
                 text_offset_x += image_padding_x + content_size.x;
             }
-        } else if(merge_with_previous && !item->thumbnail_url.empty()) {
+        } else if(merge_with_previous) {
             // TODO: Get the previous items text_offset_x instead of + 32.0f * get_ui_scale()
             text_offset_x += image_padding_x + (32.0f * get_ui_scale());
+        } else if(item->thumbnail_size.x > 0) {
+            text_offset_x += image_padding_x + get_item_thumbnail_size(item).x;
         }
 
         const float timestamp_text_y = std::floor(item_pos.y + padding_y - std::floor(6.0f * get_ui_scale()));
@@ -1172,6 +1174,8 @@ namespace QuickMedia {
         } else if(merge_with_previous) {
             // TODO: Get the previous items text_offset_x instead of + 32.0f * get_ui_scale()
             text_offset_x += image_padding_x + (32.0f * get_ui_scale());
+        } else if(item->thumbnail_size.x > 0) {
+            text_offset_x += image_padding_x + get_item_thumbnail_size(item).x;
         }
 
         if(load_texture)