Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refine naming of element-related types and traits

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Nathan Sobo 2023-04-21 13:04:03 -06:00
parent 03619dfa55
commit fe492eacbf
93 changed files with 661 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/welcome/src/base_keymap_picker.rs
View file

@ -3,7 +3,7 @@ use std::sync::Arc;
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
use gpui::{
actions,
elements::{Drawable as _, Label},
elements::{Element as _, Label},
AppContext, Task, ViewContext,
};
use picker::{Picker, PickerDelegate, PickerEvent};
@ -134,7 +134,7 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
mouse_state: &mut gpui::MouseState,
selected: bool,
cx: &gpui::AppContext,
) -> gpui::Element<Picker<Self>> {
) -> gpui::AnyElement<Picker<Self>> {
let theme = &cx.global::<Settings>().theme;
let keymap_match = &self.matches[ix];
let style = theme.picker.item.style_for(mouse_state, selected);
@ -143,6 +143,6 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
.with_highlights(keymap_match.positions.clone())
.contained()
.with_style(style.container)
.into_element()
.into_any()
}
}