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

title_bar: Update on_close_window to support binding with cx.listener. (#388)

Browse source
This commit is contained in:
Jason Lee 2024-11-01 18:39:25 +08:00 committed by GitHub
parent 80230c643f
commit 4b5d917e83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ui/src/title_bar.rs
View file

@ -2,7 +2,7 @@ use std::rc::Rc;
use crate::{h_flex, theme::ActiveTheme, Icon, IconName, InteractiveElementExt as _, Sizable as _};
use gpui::{
div, prelude::FluentBuilder as _, px, relative, AnyElement, Div, Element, Hsla,
div, prelude::FluentBuilder as _, px, relative, AnyElement, ClickEvent, Div, Element, Hsla,
InteractiveElement as _, IntoElement, ParentElement, Pixels, RenderOnce, Stateful,
StatefulInteractiveElement as _, Style, Styled, WindowContext,
};
@ -20,7 +20,7 @@ const TITLE_BAR_LEFT_PADDING: Pixels = px(12.);
pub struct TitleBar {
base: Stateful<Div>,
children: Vec<AnyElement>,
on_close_window: Option<Rc<Box<dyn Fn(&mut WindowContext)>>>,
on_close_window: Option<Rc<Box<dyn Fn(&ClickEvent, &mut WindowContext)>>>,
}
impl TitleBar {
@ -34,7 +34,10 @@ impl TitleBar {
/// Add custom for close window event, default is None, then click X button will call `cx.remove_window()`.
/// Linux only, this will do nothing on other platforms.
pub fn on_close_window(mut self, f: impl Fn(&mut WindowContext) + 'static) -> Self {
pub fn on_close_window(
mut self,
f: impl Fn(&ClickEvent, &mut WindowContext) + 'static,
) -> Self {
if cfg!(target_os = "linux") {
self.on_close_window = Some(Rc::new(Box::new(f)));
}
@ -52,7 +55,7 @@ enum ControlIcon {
Restore,
Maximize,
Close {
on_close_window: Option<Rc<Box<dyn Fn(&mut WindowContext)>>>,
on_close_window: Option<Rc<Box<dyn Fn(&ClickEvent, &mut WindowContext)>>>,
},
}
@ -69,7 +72,7 @@ impl ControlIcon {
Self::Maximize
}
fn close(on_close_window: Option<Rc<Box<dyn Fn(&mut WindowContext)>>>) -> Self {
fn close(on_close_window: Option<Rc<Box<dyn Fn(&ClickEvent, &mut WindowContext)>>>) -> Self {
Self::Close { on_close_window }
}
@ -155,7 +158,7 @@ impl RenderOnce for ControlIcon {
Self::Maximize => cx.zoom_window(),
Self::Close { .. } => {
if let Some(f) = on_close_window.clone() {
f(cx);
f(&ClickEvent::default(), cx);
} else {
cx.remove_window();
}
@ -170,7 +173,7 @@ impl RenderOnce for ControlIcon {
#[derive(IntoElement)]
struct WindowControls {
on_close_window: Option<Rc<Box<dyn Fn(&mut WindowContext)>>>,
on_close_window: Option<Rc<Box<dyn Fn(&ClickEvent, &mut WindowContext)>>>,
}
impl RenderOnce for WindowControls {