dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modal: Do not occlude when overlay is not enable. (#657)

Browse source
This commit is contained in:
Jason Lee 2025-02-25 12:25:46 +08:00 committed by GitHub
parent 806c6dffe8
commit 8edd80d5ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/story/src/modal_story.rs
View file

@ -166,6 +166,7 @@ pub struct ModalStory {
model_show_close: bool, model_show_close: bool,
model_padding: bool, model_padding: bool,
model_keyboard: bool, model_keyboard: bool,
overlay_closeable: bool,
} }
impl super::Story for ModalStory { impl super::Story for ModalStory {
@ -288,6 +289,7 @@ impl ModalStory {
model_show_close: true, model_show_close: true,
model_padding: true, model_padding: true,
model_keyboard: true, model_keyboard: true,
overlay_closeable: true,
} }
} }
@ -360,6 +362,7 @@ impl ModalStory {
let overlay = self.modal_overlay; let overlay = self.modal_overlay;
let modal_show_close = self.model_show_close; let modal_show_close = self.model_show_close;
let modal_padding = self.model_padding; let modal_padding = self.model_padding;
let overlay_closeable = self.overlay_closeable;
let input1 = self.input1.clone(); let input1 = self.input1.clone();
let date_picker = self.date_picker.clone(); let date_picker = self.date_picker.clone();
let dropdown = self.dropdown.clone(); let dropdown = self.dropdown.clone();
@ -372,6 +375,7 @@ impl ModalStory {
.overlay(overlay) .overlay(overlay)
.keyboard(keyboard) .keyboard(keyboard)
.show_close(modal_show_close) .show_close(modal_show_close)
.overlay_closable(overlay_closeable)
.when(!modal_padding, |this| this.p(px(0.))) .when(!modal_padding, |this| this.p(px(0.)))
.child( .child(
v_flex() v_flex()
@ -469,6 +473,15 @@ impl Render for ModalStory {
cx.notify(); cx.notify();
})), })),
) )
.child(
Checkbox::new("overlay-closeable")
.label("Overlay Closeable")
.checked(self.overlay_closeable)
.on_click(cx.listener(|view, _, _, cx| {
view.overlay_closeable = !view.overlay_closeable;
cx.notify();
})),
)
.child( .child(
Checkbox::new("modal-show-close") Checkbox::new("modal-show-close")
.label("Model Close Button") .label("Model Close Button")

3
crates/ui/src/modal.rs
View file

@ -357,11 +357,10 @@ impl RenderOnce for Modal {
.snap_to_window() .snap_to_window()
.child( .child(
div() div()
.occlude()
.w(view_size.width) .w(view_size.width)
.h(view_size.height) .h(view_size.height)
.when(self.overlay_visible, |this| { .when(self.overlay_visible, |this| {
this.bg(overlay_color(self.overlay, window, cx)) this.occlude().bg(overlay_color(self.overlay, window, cx))
}) })
.when(self.overlay_closable, |this| { .when(self.overlay_closable, |this| {
this.on_mouse_down(MouseButton::Left, { this.on_mouse_down(MouseButton::Left, {