[fractal] room-history: Fix corners of media messages in replies
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] room-history: Fix corners of media messages in replies
- Date: Tue, 11 Oct 2022 12:38:07 +0000 (UTC)
commit 19d5f87e48782685c5ce226ff673f5f743ff0a41
Author: Kévin Commaille <zecakeh tedomum fr>
Date: Mon Oct 10 16:44:51 2022 +0200
room-history: Fix corners of media messages in replies
data/resources/style.css | 6 +++---
data/resources/ui/content-message-location.ui | 2 +-
data/resources/ui/content-message-media.ui | 2 +-
src/session/content/room_history/message_row/media.rs | 10 ++++++----
4 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/data/resources/style.css b/data/resources/style.css
index c0bc8eb2b..75c93fc00 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -383,18 +383,18 @@ login {
font-size: 3em;
}
-.room-history .event-content .thumbnail {
+.content-thumbnail {
border-radius: 6px;
background-color: @borders;
}
-.room-history .event-content .thumbnail .osd.circular {
+.content-thumbnail .osd.circular {
min-width: 64px;
min-height: 64px;
border-radius: 32px;
}
-.room-history .event-content .thumbnail .timestamp {
+.content-thumbnail .timestamp {
border-radius: 4px;
padding: 2px 5px;
}
diff --git a/data/resources/ui/content-message-location.ui b/data/resources/ui/content-message-location.ui
index 22b88afed..7c9a24fad 100644
--- a/data/resources/ui/content-message-location.ui
+++ b/data/resources/ui/content-message-location.ui
@@ -2,7 +2,7 @@
<interface>
<template class="ContentMessageLocation" parent="GtkWidget">
<style>
- <class name="thumbnail"/>
+ <class name="content-thumbnail"/>
</style>
<property name="overflow">hidden</property>
<child>
diff --git a/data/resources/ui/content-message-media.ui b/data/resources/ui/content-message-media.ui
index 542fc6ddf..f165fb3cf 100644
--- a/data/resources/ui/content-message-media.ui
+++ b/data/resources/ui/content-message-media.ui
@@ -6,7 +6,7 @@
<child>
<object class="GtkOverlay" id="media">
<style>
- <class name="thumbnail"/>
+ <class name="content-thumbnail"/>
</style>
<property name="overflow">hidden</property>
<child type="overlay">
diff --git a/src/session/content/room_history/message_row/media.rs
b/src/session/content/room_history/message_row/media.rs
index 22d94398b..e283d5834 100644
--- a/src/session/content/room_history/message_row/media.rs
+++ b/src/session/content/room_history/message_row/media.rs
@@ -437,10 +437,12 @@ impl MessageMedia {
child.set_paintable(Some(&texture));
child.set_tooltip_text(body.as_deref());
- if media_type == MediaType::Sticker &&
priv_.media.has_css_class("thumbnail") {
- priv_.media.remove_css_class("thumbnail");
- } else if !priv_.media.has_css_class("thumbnail") {
- priv_.media.add_css_class("thumbnail");
+ if media_type == MediaType::Sticker {
+ if priv_.media.has_css_class("content-thumbnail") {
+ priv_.media.remove_css_class("content-thumbnail");
+ }
+ } else if !priv_.media.has_css_class("content-thumbnail") {
+ priv_.media.add_css_class("content-thumbnail");
}
}
Err(error) => {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]