There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
451 lines
19 KiB
Rust
451 lines
19 KiB
Rust
#![allow(unused, dead_code)]
|
|
use gpui::{actions, hsla, AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Hsla};
|
|
use strum::IntoEnumIterator;
|
|
use theme::all_theme_colors;
|
|
use ui::{
|
|
element_cell, prelude::*, string_cell, utils::calculate_contrast_ratio, AudioStatus,
|
|
Availability, Avatar, AvatarAudioStatusIndicator, AvatarAvailabilityIndicator, ButtonLike,
|
|
Checkbox, CheckboxWithLabel, ContentGroup, DecoratedIcon, ElevationIndex, Facepile,
|
|
IconDecoration, Indicator, Switch, Table, TintColor, Tooltip,
|
|
};
|
|
|
|
use crate::{Item, Workspace};
|
|
|
|
actions!(debug, [OpenThemePreview]);
|
|
|
|
pub fn init(cx: &mut App) {
|
|
cx.observe_new(|workspace: &mut Workspace, _, _| {
|
|
workspace.register_action(|workspace, _: &OpenThemePreview, window, cx| {
|
|
let theme_preview = cx.new(|cx| ThemePreview::new(window, cx));
|
|
workspace.add_item_to_active_pane(Box::new(theme_preview), None, true, window, cx)
|
|
});
|
|
})
|
|
.detach();
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, strum::EnumIter)]
|
|
enum ThemePreviewPage {
|
|
Overview,
|
|
Typography,
|
|
Components,
|
|
}
|
|
|
|
impl ThemePreviewPage {
|
|
pub fn name(&self) -> &'static str {
|
|
match self {
|
|
Self::Overview => "Overview",
|
|
Self::Typography => "Typography",
|
|
Self::Components => "Components",
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ThemePreview {
|
|
current_page: ThemePreviewPage,
|
|
focus_handle: FocusHandle,
|
|
}
|
|
|
|
impl ThemePreview {
|
|
pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
|
|
Self {
|
|
current_page: ThemePreviewPage::Overview,
|
|
focus_handle: cx.focus_handle(),
|
|
}
|
|
}
|
|
|
|
pub fn view(
|
|
&self,
|
|
page: ThemePreviewPage,
|
|
window: &mut Window,
|
|
cx: &mut Context<ThemePreview>,
|
|
) -> impl IntoElement {
|
|
match page {
|
|
ThemePreviewPage::Overview => self.render_overview_page(window, cx).into_any_element(),
|
|
ThemePreviewPage::Typography => {
|
|
self.render_typography_page(window, cx).into_any_element()
|
|
}
|
|
ThemePreviewPage::Components => {
|
|
self.render_components_page(window, cx).into_any_element()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<()> for ThemePreview {}
|
|
|
|
impl Focusable for ThemePreview {
|
|
fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
|
|
self.focus_handle.clone()
|
|
}
|
|
}
|
|
impl ThemePreview {}
|
|
|
|
impl Item for ThemePreview {
|
|
type Event = ();
|
|
|
|
fn to_item_events(_: &Self::Event, _: impl FnMut(crate::item::ItemEvent)) {}
|
|
|
|
fn tab_content_text(&self, window: &Window, cx: &App) -> Option<SharedString> {
|
|
let name = cx.theme().name.clone();
|
|
Some(format!("{} Preview", name).into())
|
|
}
|
|
|
|
fn telemetry_event_text(&self) -> Option<&'static str> {
|
|
None
|
|
}
|
|
|
|
fn clone_on_split(
|
|
&self,
|
|
_workspace_id: Option<crate::WorkspaceId>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> Option<Entity<Self>>
|
|
where
|
|
Self: Sized,
|
|
{
|
|
Some(cx.new(|cx| Self::new(window, cx)))
|
|
}
|
|
}
|
|
|
|
const AVATAR_URL: &str = "https://avatars.githubusercontent.com/u/1714999?v=4";
|
|
|
|
impl ThemePreview {
|
|
fn preview_bg(window: &mut Window, cx: &mut App) -> Hsla {
|
|
cx.theme().colors().editor_background
|
|
}
|
|
|
|
fn render_text(
|
|
&self,
|
|
layer: ElevationIndex,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
let bg = layer.bg(cx);
|
|
|
|
let label_with_contrast = |label: &str, fg: Hsla| {
|
|
let contrast = calculate_contrast_ratio(fg, bg);
|
|
format!("{} ({:.2})", label, contrast)
|
|
};
|
|
|
|
v_flex()
|
|
.gap_1()
|
|
.child(Headline::new("Text").size(HeadlineSize::Small).color(Color::Muted))
|
|
.child(
|
|
h_flex()
|
|
.items_start()
|
|
.gap_4()
|
|
.child(
|
|
v_flex()
|
|
.gap_1()
|
|
.child(Headline::new("Headline Sizes").size(HeadlineSize::Small).color(Color::Muted))
|
|
.child(Headline::new("XLarge Headline").size(HeadlineSize::XLarge))
|
|
.child(Headline::new("Large Headline").size(HeadlineSize::Large))
|
|
.child(Headline::new("Medium Headline").size(HeadlineSize::Medium))
|
|
.child(Headline::new("Small Headline").size(HeadlineSize::Small))
|
|
.child(Headline::new("XSmall Headline").size(HeadlineSize::XSmall)),
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.gap_1()
|
|
.child(Headline::new("Text Colors").size(HeadlineSize::Small).color(Color::Muted))
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Default Text",
|
|
Color::Default.color(cx),
|
|
))
|
|
.color(Color::Default),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Accent Text",
|
|
Color::Accent.color(cx),
|
|
))
|
|
.color(Color::Accent),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Conflict Text",
|
|
Color::Conflict.color(cx),
|
|
))
|
|
.color(Color::Conflict),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Created Text",
|
|
Color::Created.color(cx),
|
|
))
|
|
.color(Color::Created),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Deleted Text",
|
|
Color::Deleted.color(cx),
|
|
))
|
|
.color(Color::Deleted),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Disabled Text",
|
|
Color::Disabled.color(cx),
|
|
))
|
|
.color(Color::Disabled),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Error Text",
|
|
Color::Error.color(cx),
|
|
))
|
|
.color(Color::Error),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Hidden Text",
|
|
Color::Hidden.color(cx),
|
|
))
|
|
.color(Color::Hidden),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Hint Text",
|
|
Color::Hint.color(cx),
|
|
))
|
|
.color(Color::Hint),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Ignored Text",
|
|
Color::Ignored.color(cx),
|
|
))
|
|
.color(Color::Ignored),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Info Text",
|
|
Color::Info.color(cx),
|
|
))
|
|
.color(Color::Info),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Modified Text",
|
|
Color::Modified.color(cx),
|
|
))
|
|
.color(Color::Modified),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Muted Text",
|
|
Color::Muted.color(cx),
|
|
))
|
|
.color(Color::Muted),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Placeholder Text",
|
|
Color::Placeholder.color(cx),
|
|
))
|
|
.color(Color::Placeholder),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Selected Text",
|
|
Color::Selected.color(cx),
|
|
))
|
|
.color(Color::Selected),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Success Text",
|
|
Color::Success.color(cx),
|
|
))
|
|
.color(Color::Success),
|
|
)
|
|
.child(
|
|
Label::new(label_with_contrast(
|
|
"Warning Text",
|
|
Color::Warning.color(cx),
|
|
))
|
|
.color(Color::Warning),
|
|
)
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.gap_1()
|
|
.child(Headline::new("Wrapping Text").size(HeadlineSize::Small).color(Color::Muted))
|
|
.child(
|
|
div().max_w(px(200.)).child(
|
|
"This is a longer piece of text that should wrap to multiple lines. It demonstrates how text behaves when it exceeds the width of its container."
|
|
))
|
|
)
|
|
)
|
|
}
|
|
|
|
fn render_colors(
|
|
&self,
|
|
layer: ElevationIndex,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
let bg = layer.bg(cx);
|
|
let all_colors = all_theme_colors(cx);
|
|
|
|
v_flex()
|
|
.gap_1()
|
|
.child(
|
|
Headline::new("Colors")
|
|
.size(HeadlineSize::Small)
|
|
.color(Color::Muted),
|
|
)
|
|
.child(
|
|
h_flex()
|
|
.flex_wrap()
|
|
.gap_1()
|
|
.children(all_colors.into_iter().map(|(color, name)| {
|
|
let id = ElementId::Name(format!("{:?}-preview", color).into());
|
|
let name = name.clone();
|
|
div().size_8().flex_none().child(
|
|
ButtonLike::new(id)
|
|
.child(
|
|
div()
|
|
.size_8()
|
|
.bg(color)
|
|
.border_1()
|
|
.border_color(cx.theme().colors().border)
|
|
.overflow_hidden(),
|
|
)
|
|
.size(ButtonSize::None)
|
|
.style(ButtonStyle::Transparent)
|
|
.tooltip(move |window, cx| {
|
|
let name = name.clone();
|
|
Tooltip::with_meta(
|
|
name,
|
|
None,
|
|
format!("{:?}", color),
|
|
window,
|
|
cx,
|
|
)
|
|
}),
|
|
)
|
|
})),
|
|
)
|
|
}
|
|
|
|
fn render_theme_layer(
|
|
&self,
|
|
layer: ElevationIndex,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
v_flex()
|
|
.p_4()
|
|
.bg(layer.bg(cx))
|
|
.text_color(cx.theme().colors().text)
|
|
.gap_2()
|
|
.child(Headline::new(layer.clone().to_string()).size(HeadlineSize::Medium))
|
|
.child(self.render_text(layer, window, cx))
|
|
.child(self.render_colors(layer, window, cx))
|
|
}
|
|
|
|
fn render_overview_page(
|
|
&self,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
v_flex()
|
|
.id("theme-preview-overview")
|
|
.overflow_scroll()
|
|
.size_full()
|
|
.child(
|
|
v_flex()
|
|
.child(Headline::new("Theme Preview").size(HeadlineSize::Large))
|
|
.child(div().w_full().text_color(cx.theme().colors().text_muted).child("This view lets you preview a range of UI elements across a theme. Use it for testing out changes to the theme."))
|
|
)
|
|
.child(self.render_theme_layer(ElevationIndex::Background, window, cx))
|
|
.child(self.render_theme_layer(ElevationIndex::Surface, window, cx))
|
|
.child(self.render_theme_layer(ElevationIndex::EditorSurface, window, cx))
|
|
.child(self.render_theme_layer(ElevationIndex::ElevatedSurface, window, cx))
|
|
}
|
|
|
|
fn render_typography_page(
|
|
&self,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> impl IntoElement {
|
|
v_flex()
|
|
.id("theme-preview-typography")
|
|
.overflow_scroll()
|
|
.size_full()
|
|
.child(v_flex()
|
|
.gap_4()
|
|
.child(Headline::new("Headline 1").size(HeadlineSize::XLarge))
|
|
.child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."))
|
|
.child(Headline::new("Headline 2").size(HeadlineSize::Large))
|
|
.child(Label::new("Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."))
|
|
.child(Headline::new("Headline 3").size(HeadlineSize::Medium))
|
|
.child(Label::new("Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."))
|
|
.child(Headline::new("Headline 4").size(HeadlineSize::Small))
|
|
.child(Label::new("Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
|
|
.child(Headline::new("Headline 5").size(HeadlineSize::XSmall))
|
|
.child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."))
|
|
.child(Headline::new("Body Text").size(HeadlineSize::Small))
|
|
.child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
|
|
)
|
|
}
|
|
|
|
fn render_components_page(&self, window: &mut Window, cx: &mut App) -> impl IntoElement {
|
|
let layer = ElevationIndex::Surface;
|
|
|
|
v_flex()
|
|
.id("theme-preview-components")
|
|
.overflow_scroll()
|
|
.size_full()
|
|
.gap_2()
|
|
.child(Button::render_component_previews(window, cx))
|
|
.child(Checkbox::render_component_previews(window, cx))
|
|
.child(CheckboxWithLabel::render_component_previews(window, cx))
|
|
.child(ContentGroup::render_component_previews(window, cx))
|
|
.child(DecoratedIcon::render_component_previews(window, cx))
|
|
.child(Facepile::render_component_previews(window, cx))
|
|
.child(Icon::render_component_previews(window, cx))
|
|
.child(IconDecoration::render_component_previews(window, cx))
|
|
.child(Indicator::render_component_previews(window, cx))
|
|
.child(Switch::render_component_previews(window, cx))
|
|
.child(Table::render_component_previews(window, cx))
|
|
}
|
|
|
|
fn render_page_nav(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
h_flex()
|
|
.id("theme-preview-nav")
|
|
.items_center()
|
|
.gap_4()
|
|
.py_2()
|
|
.bg(Self::preview_bg(window, cx))
|
|
.children(ThemePreviewPage::iter().map(|p| {
|
|
Button::new(ElementId::Name(p.name().into()), p.name())
|
|
.on_click(cx.listener(move |this, _, window, cx| {
|
|
this.current_page = p;
|
|
cx.notify();
|
|
}))
|
|
.toggle_state(p == self.current_page)
|
|
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
|
|
}))
|
|
}
|
|
}
|
|
|
|
impl Render for ThemePreview {
|
|
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
|
|
v_flex()
|
|
.id("theme-preview")
|
|
.key_context("ThemePreview")
|
|
.items_start()
|
|
.overflow_hidden()
|
|
.size_full()
|
|
.max_h_full()
|
|
.track_focus(&self.focus_handle)
|
|
.px_2()
|
|
.bg(Self::preview_bg(window, cx))
|
|
.child(self.render_page_nav(window, cx))
|
|
.child(self.view(self.current_page, window, cx))
|
|
}
|
|
}
|