7bdc99abc1
This removes around 900 unnecessary clones, ranging from cloning a few ints all the way to large data structures and images. A lot of these were fixed using `cargo clippy --fix --workspace --all-targets`, however it often breaks other lints and needs to be run again. This was then followed up with some manual fixing. I understand this is a large diff, but all the changes are pretty trivial. Rust is doing some heavy lifting here for us. Once I get it up to speed with main, I'd appreciate this getting merged rather sooner than later. Release Notes: - N/A
94 lines
2.5 KiB
Rust
94 lines
2.5 KiB
Rust
use gpui::{
|
|
AnyView, Corner, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription,
|
|
};
|
|
use ui::{
|
|
App, ButtonCommon, FluentBuilder as _, IntoElement, PopoverMenu, PopoverMenuHandle,
|
|
PopoverTrigger, RenderOnce, Window, px,
|
|
};
|
|
|
|
use crate::{Picker, PickerDelegate};
|
|
|
|
pub struct PickerPopoverMenu<T, TT, P>
|
|
where
|
|
T: PopoverTrigger + ButtonCommon,
|
|
TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
|
|
P: PickerDelegate,
|
|
{
|
|
picker: Entity<Picker<P>>,
|
|
trigger: T,
|
|
tooltip: TT,
|
|
handle: Option<PopoverMenuHandle<Picker<P>>>,
|
|
anchor: Corner,
|
|
_subscriptions: Vec<Subscription>,
|
|
}
|
|
|
|
impl<T, TT, P> PickerPopoverMenu<T, TT, P>
|
|
where
|
|
T: PopoverTrigger + ButtonCommon,
|
|
TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
|
|
P: PickerDelegate,
|
|
{
|
|
pub fn new(
|
|
picker: Entity<Picker<P>>,
|
|
trigger: T,
|
|
tooltip: TT,
|
|
anchor: Corner,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
Self {
|
|
_subscriptions: vec![cx.subscribe(&picker, |picker, &DismissEvent, cx| {
|
|
picker.update(cx, |_, cx| cx.emit(DismissEvent));
|
|
})],
|
|
picker,
|
|
trigger,
|
|
tooltip,
|
|
handle: None,
|
|
anchor,
|
|
}
|
|
}
|
|
|
|
pub fn with_handle(mut self, handle: PopoverMenuHandle<Picker<P>>) -> Self {
|
|
self.handle = Some(handle);
|
|
self
|
|
}
|
|
}
|
|
|
|
impl<T, TT, P> EventEmitter<DismissEvent> for PickerPopoverMenu<T, TT, P>
|
|
where
|
|
T: PopoverTrigger + ButtonCommon,
|
|
TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
|
|
P: PickerDelegate,
|
|
{
|
|
}
|
|
|
|
impl<T, TT, P> Focusable for PickerPopoverMenu<T, TT, P>
|
|
where
|
|
T: PopoverTrigger + ButtonCommon,
|
|
TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
|
|
P: PickerDelegate,
|
|
{
|
|
fn focus_handle(&self, cx: &App) -> FocusHandle {
|
|
self.picker.focus_handle(cx)
|
|
}
|
|
}
|
|
|
|
impl<T, TT, P> RenderOnce for PickerPopoverMenu<T, TT, P>
|
|
where
|
|
T: PopoverTrigger + ButtonCommon,
|
|
TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
|
|
P: PickerDelegate,
|
|
{
|
|
fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
|
|
let picker = self.picker.clone();
|
|
|
|
PopoverMenu::new("popover-menu")
|
|
.menu(move |_window, _cx| Some(picker.clone()))
|
|
.trigger_with_tooltip(self.trigger, self.tooltip)
|
|
.anchor(self.anchor)
|
|
.when_some(self.handle, |menu, handle| menu.with_handle(handle))
|
|
.offset(gpui::Point {
|
|
x: px(0.0),
|
|
y: px(-2.0),
|
|
})
|
|
}
|
|
}
|