WIP
This commit is contained in:
@@ -3,7 +3,7 @@ use std::path::Path;
|
||||
use fuzzy::StringMatch;
|
||||
use gpui::{
|
||||
elements::{Label, LabelStyle},
|
||||
Element, ElementBox, View,
|
||||
Drawable, Element, View,
|
||||
};
|
||||
use workspace::WorkspaceLocation;
|
||||
|
||||
@@ -42,7 +42,7 @@ impl HighlightedText {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn render<V: View>(self, style: impl Into<LabelStyle>) -> ElementBox<V> {
|
||||
pub fn render<V: View>(self, style: impl Into<LabelStyle>) -> Element<V> {
|
||||
Label::new(self.text, style)
|
||||
.with_highlights(self.highlight_positions)
|
||||
.boxed()
|
||||
|
||||
@@ -4,7 +4,7 @@ use fuzzy::{StringMatch, StringMatchCandidate};
|
||||
use gpui::{
|
||||
actions,
|
||||
elements::{ChildView, Flex, ParentElement},
|
||||
AnyViewHandle, AppContext, Element, ElementBox, Entity, Task, View, ViewContext, ViewHandle,
|
||||
AnyViewHandle, AppContext, Drawable, Element, Entity, Task, View, ViewContext, ViewHandle,
|
||||
};
|
||||
use highlighted_workspace_location::HighlightedWorkspaceLocation;
|
||||
use ordered_float::OrderedFloat;
|
||||
@@ -101,7 +101,7 @@ impl View for RecentProjectsView {
|
||||
"RecentProjectsView"
|
||||
}
|
||||
|
||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
|
||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> Element<Self> {
|
||||
ChildView::new(&self.picker, cx).boxed()
|
||||
}
|
||||
|
||||
@@ -183,7 +183,7 @@ impl PickerDelegate for RecentProjectsView {
|
||||
mouse_state: &mut gpui::MouseState,
|
||||
selected: bool,
|
||||
cx: &gpui::AppContext,
|
||||
) -> ElementBox<Picker<Self>> {
|
||||
) -> Element<Picker<Self>> {
|
||||
let settings = cx.global::<Settings>();
|
||||
let string_match = &self.matches[ix];
|
||||
let style = settings.theme.picker.item.style_for(mouse_state, selected);
|
||||
|
||||
Reference in New Issue
Block a user