mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-10 20:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix compile issue

Browse source
This commit is contained in:
Mikayla 2024-01-20 20:15:02 -08:00
parent bf878b8257
commit 2083fdcaf6
No known key found for this signature in database
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
crates/gpui/src/elements/div.rs
View file

@ -1167,36 +1167,36 @@ impl DivState {
pub struct Interactivity { pub struct Interactivity {
/// The element ID of the element /// The element ID of the element
pub element_id: Option<ElementId>, pub element_id: Option<ElementId>,
key_context: Option<KeyContext>, pub(crate) key_context: Option<KeyContext>,
focusable: bool, pub(crate) focusable: bool,
tracked_focus_handle: Option<FocusHandle>, pub(crate) tracked_focus_handle: Option<FocusHandle>,
scroll_handle: Option<ScrollHandle>, pub(crate) scroll_handle: Option<ScrollHandle>,
group: Option<SharedString>, pub(crate) group: Option<SharedString>,
/// The base style of the element, before any modifications are applied /// The base style of the element, before any modifications are applied
/// by focus, active, etc. /// by focus, active, etc.
pub base_style: Box<StyleRefinement>, pub base_style: Box<StyleRefinement>,
focus_style: Option<Box<StyleRefinement>>, pub(crate) focus_style: Option<Box<StyleRefinement>>,
in_focus_style: Option<Box<StyleRefinement>>, pub(crate) in_focus_style: Option<Box<StyleRefinement>>,
hover_style: Option<Box<StyleRefinement>>, pub(crate) hover_style: Option<Box<StyleRefinement>>,
group_hover_style: Option<GroupStyle>, pub(crate) group_hover_style: Option<GroupStyle>,
active_style: Option<Box<StyleRefinement>>, pub(crate) active_style: Option<Box<StyleRefinement>>,
group_active_style: Option<GroupStyle>, pub(crate) group_active_style: Option<GroupStyle>,
drag_over_styles: Vec<(TypeId, StyleRefinement)>, pub(crate) drag_over_styles: Vec<(TypeId, StyleRefinement)>,
group_drag_over_styles: Vec<(TypeId, GroupStyle)>, pub(crate) group_drag_over_styles: Vec<(TypeId, GroupStyle)>,
mouse_down_listeners: Vec<MouseDownListener>, pub(crate) mouse_down_listeners: Vec<MouseDownListener>,
mouse_up_listeners: Vec<MouseUpListener>, pub(crate) mouse_up_listeners: Vec<MouseUpListener>,
mouse_move_listeners: Vec<MouseMoveListener>, pub(crate) mouse_move_listeners: Vec<MouseMoveListener>,
scroll_wheel_listeners: Vec<ScrollWheelListener>, pub(crate) scroll_wheel_listeners: Vec<ScrollWheelListener>,
key_down_listeners: Vec<KeyDownListener>, pub(crate) key_down_listeners: Vec<KeyDownListener>,
key_up_listeners: Vec<KeyUpListener>, pub(crate) key_up_listeners: Vec<KeyUpListener>,
action_listeners: Vec<(TypeId, ActionListener)>, pub(crate) action_listeners: Vec<(TypeId, ActionListener)>,
drop_listeners: Vec<(TypeId, DropListener)>, pub(crate) drop_listeners: Vec<(TypeId, DropListener)>,
can_drop_predicate: Option<CanDropPredicate>, pub(crate) can_drop_predicate: Option<CanDropPredicate>,
click_listeners: Vec<ClickListener>, pub(crate) click_listeners: Vec<ClickListener>,
drag_listener: Option<(Box<dyn Any>, DragListener)>, pub(crate) drag_listener: Option<(Box<dyn Any>, DragListener)>,
hover_listener: Option<Box<dyn Fn(&bool, &mut WindowContext)>>, pub(crate) hover_listener: Option<Box<dyn Fn(&bool, &mut WindowContext)>>,
tooltip_builder: Option<TooltipBuilder>, pub(crate) tooltip_builder: Option<TooltipBuilder>,
block_mouse: bool, pub(crate) block_mouse: bool,
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
pub(crate) location: Option<core::panic::Location<'static>>, pub(crate) location: Option<core::panic::Location<'static>>,
@ -2061,7 +2061,8 @@ impl GroupBounds {
/// A wrapper around an element that can be focused. /// A wrapper around an element that can be focused.
pub struct Focusable<E> { pub struct Focusable<E> {
pub(crate) element: E, /// The element that is focusable
pub element: E,
} }
impl<E: InteractiveElement> FocusableElement for Focusable<E> {} impl<E: InteractiveElement> FocusableElement for Focusable<E> {}

2
crates/gpui/src/elements/text.rs
View file

@ -489,7 +489,7 @@ impl Element for InteractiveText {
move |mut cx| async move { move |mut cx| async move {
cx.background_executor().timer(TOOLTIP_DELAY).await; cx.background_executor().timer(TOOLTIP_DELAY).await;
cx.update(|_, cx| { cx.update(|cx| {
let new_tooltip = let new_tooltip =
tooltip_builder(position, cx).map(|tooltip| ActiveTooltip { tooltip_builder(position, cx).map(|tooltip| ActiveTooltip {
tooltip: Some(AnyTooltip { tooltip: Some(AnyTooltip {