mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 11:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix toast contents not filling container

Browse source
This commit is contained in:
Nate Butler 2023-10-13 11:46:48 -04:00
parent 7ba305e033
commit 8bd4107423
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/ui2/src/components/notification.rs
View file

@ -11,7 +11,7 @@ use crate::{
///
/// You must provide a primary action for the user to take.
///
/// To simply convey information, use a Status.
/// To simply convey information, use a `StatusToast`.
#[derive(Element)]
pub struct NotificationToast<S: 'static + Send + Sync + Clone> {
state_type: PhantomData<S>,
@ -52,21 +52,27 @@ impl<S: 'static + Send + Sync + Clone> NotificationToast<S> {
let color = ThemeColor::new(cx);
let notification = h_stack()
.min_w_64()
.max_w_96()
.gap_1()
.items_start()
.p_1()
.children(self.left_icon.map(|i| IconElement::new(i)))
.child(
v_stack()
.flex_1()
.w_full()
.gap_1()
.child(
h_stack()
.justify_between()
.p_1()
.child(Label::new(self.title.clone()))
.child(IconButton::new(Icon::Close)),
.child(IconButton::new(Icon::Close).color(crate::IconColor::Muted)),
)
.child(
v_stack()
.p_1()
.overflow_hidden_x()
.gap_1()
.child(Label::new(self.message.clone()))
.child(
h_stack()

17
crates/ui2/src/components/toast.rs
View file

@ -10,6 +10,11 @@ pub enum ToastOrigin {
BottomRight,
}
/// Don't use toast directly:
///
/// - For messages with a required action, use a `NotificationToast`.
/// - For messages that convey information, use a `StatusToast`.
///
/// A toast is a small, temporary window that appears to show a message to the user
/// or indicate a required action.
///
@ -39,19 +44,19 @@ impl<S: 'static + Send + Sync> Toast<S> {
if self.origin == ToastOrigin::Bottom {
div = div.right_1_2();
} else {
div = div.right_4();
div = div.right_2();
}
div.z_index(5)
.absolute()
.bottom_4()
.bottom_9()
.flex()
.py_2()
.py_1()
.px_1p5()
.min_w_64()
.rounded_md()
.rounded_lg()
.shadow_md()
.overflow_hidden()
.fill(color.elevated_surface)
.max_w_96()
.children(self.children.drain(..))
}
}