Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start styling notification panel

Browse source
This commit is contained in:
Max Brunsfeld 2023-10-22 16:03:33 +02:00
parent c20e781441
commit 23400a5a70
5 changed files with 81 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/collab_ui/src/collab_ui.rs
View file

@ -11,7 +11,7 @@ use call::{report_call_event_for_room, ActiveCall, Room};
use feature_flags::{ChannelsAlpha, FeatureFlagAppExt};
use gpui::{
actions,
elements::{Empty, Image},
elements::{ContainerStyle, Empty, Image},
geometry::{
rect::RectF,
vector::{vec2f, Vector2F},
@ -20,7 +20,7 @@ use gpui::{
AnyElement, AppContext, Element, ImageData, Task,
};
use std::{rc::Rc, sync::Arc};
use theme::Theme;
use theme::AvatarStyle;
use time::{OffsetDateTime, UtcOffset};
use util::ResultExt;
use workspace::AppState;
@ -133,8 +133,11 @@ fn notification_window_options(
}
}
fn render_avatar<T: 'static>(avatar: Option<Arc<ImageData>>, theme: &Arc<Theme>) -> AnyElement<T> {
let avatar_style = theme.chat_panel.avatar;
fn render_avatar<T: 'static>(
avatar: Option<Arc<ImageData>>,
avatar_style: &AvatarStyle,
container: ContainerStyle,
) -> AnyElement<T> {
avatar
.map(|avatar| {
Image::from_data(avatar)
@ -154,7 +157,7 @@ fn render_avatar<T: 'static>(avatar: Option<Arc<ImageData>>, theme: &Arc<Theme>)
.into_any()
})
.contained()
.with_style(theme.chat_panel.avatar_container)
.with_style(container)
.into_any()
}