vv
/
fractal
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

Merge branch 'message_row_layout' into 'main' 

message_row: Improve message layout

Closes #1313

See merge request GNOME/fractal!1461
This commit is contained in:
Felipe Kinoshita 2023-12-22 20:38:21 +00:00
parent 541f4fa19c d89f5578a8
commit 36743c52e3
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/session/view/content/room_history/message_row/mod.ui
View File

@ -27,7 +27,6 @@
</layout>
<child>
<object class="GtkLabel" id="display_name">
<property name="hexpand">true</property>
<property name="halign">start</property>
<property name="ellipsize">end</property>
<property name="selectable">True</property>
@ -39,6 +38,7 @@
</child>
<child>
<object class="GtkLabel" id="timestamp">
<property name="yalign">0.75</property>
<style>
<class name="caption"/>
<class name="timestamp"/>
@ -81,7 +81,8 @@
</child>
<child>
<object class="ContentReadReceiptsList" id="read_receipts">
<binding name="visible">
<property name="valign">end</property>
<binding name="can-target">
<lookup name="has-read-receipts" type="RoomEvent">
<lookup name="event">ContentMessageRow</lookup>
</lookup>
@ -94,9 +95,9 @@
</lookup>
</binding>
<layout>
<property name="column">1</property>
<property name="row">3</property>
<property name="column-span">2</property>
<property name="column">3</property>
<property name="row">2</property>
<property name="column-span">3</property>
</layout>
</object>
</child>

2
src/session/view/content/room_history/read_receipts_list/mod.rs
View File

@ -15,7 +15,7 @@ use crate::{
// Keep in sync with the `max-avatars` property of the `avatar_list` in the
// UI file.
const MAX_RECEIPTS_SHOWN: u32 = 10;
const MAX_RECEIPTS_SHOWN: u32 = 4;
mod imp {
use std::cell::{Cell, RefCell};

2
src/session/view/content/room_history/read_receipts_list/mod.ui
View File

@ -16,7 +16,7 @@
<child>
<object class="OverlappingAvatars" id="avatar_list">
<property name="avatar-size">20</property>
<property name="max-avatars">10</property>
<property name="max-avatars">4</property>
</object>
</child>
</object>