Skip to content

Commit f5b89a4

Browse files
committed
Fix PR problem
1 parent 67a073e commit f5b89a4

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

src/home/room_screen.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,13 @@ live_design! {
127127

128128
reply_preview_body = <HtmlOrPlaintext> {
129129
html_view = { html = {
130-
padding: { top: 6.0 }
131130
font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE)
132131
draw_normal: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } },
133132
draw_italic: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } },
134133
draw_bold: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } },
135134
draw_bold_italic: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } },
136135
draw_fixed: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } },
137-
a = { margin: { top: (-6.0) } }
136+
// a = { draw_text: { text_style: { font_size: (MESSAGE_REPLY_PREVIEW_FONT_SIZE) } } },
138137
} }
139138
plaintext_view = { pt_label = {
140139
draw_text: {
@@ -360,16 +359,7 @@ live_design! {
360359
}
361360
}
362361

363-
message = <HtmlOrPlaintext> {
364-
html_view = {
365-
html = {
366-
padding: { top: 6.0 }
367-
a = {
368-
margin: { top: (-6.0) }
369-
}
370-
}
371-
}
372-
}
362+
message = <HtmlOrPlaintext> { }
373363

374364
// <LineH> {
375365
// margin: {top: 13.0, bottom: 5.0}

src/home/rooms_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{cmp::Ordering, collections::HashMap, ops::Deref};
22
use crossbeam_queue::SegQueue;
33
use imbl::HashSet;
44
use makepad_widgets::*;
5-
use matrix_sdk::ruma::{events::tag::{TagName, Tags}, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, OwnedRoomId, RoomOrAliasId};
5+
use matrix_sdk::ruma::{events::tag::{TagName, Tags}, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, OwnedRoomId};
66
use bitflags::bitflags;
77
use crate::{app::AppState, shared::jump_to_bottom_button::UnreadMessageCount, sliding_sync::{submit_async_request, MatrixRequest, PaginationDirection}};
88

src/shared/html_or_plaintext.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use makepad_widgets::{makepad_html::HtmlDoc, *};
44
use matrix_sdk::{ruma::{matrix_uri::MatrixId, MatrixToUri, MatrixUri, OwnedMxcUri, OwnedRoomOrAliasId}, OwnedServerName};
55

6-
use crate::{avatar_cache::{self, AvatarCacheEntry}, home::{room_preview_cache, rooms_list}, profile::user_profile_cache, sliding_sync::current_user_id, utils};
6+
use crate::{avatar_cache::{self, AvatarCacheEntry}, home::room_preview_cache, profile::user_profile_cache, sliding_sync::current_user_id, utils};
77

88
use super::avatar::AvatarWidgetExt;
99

src/sliding_sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ use futures_util::{pin_mut, StreamExt};
77
use imbl::Vector;
88
use makepad_widgets::{error, log, warning, Cx, SignalToUI};
99
use matrix_sdk::{
10-
config::RequestConfig, event_handler::EventHandlerDropGuard, media::MediaRequest, room::RoomMember, room_preview::RoomPreview, ruma::{
10+
config::RequestConfig, event_handler::EventHandlerDropGuard, media::MediaRequest, room::RoomMember, ruma::{
1111
api::client::receipt::create_receipt::v3::ReceiptType, events::{
1212
receipt::ReceiptThread, room::{
1313
message::{ForwardThread, RoomMessageEventContent}, power_levels::RoomPowerLevels, MediaSource
1414
}, FullStateEventContent, MessageLikeEventType, StateEventType
15-
}, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId, RoomOrAliasId, UserId
15+
}, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId, UserId
1616
}, sliding_sync::VersionBuilder, Client, ClientBuildError, Error, OwnedServerName, Room, RoomMemberships
1717
};
1818
use matrix_sdk_ui::{

0 commit comments

Comments
 (0)