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>
166 lines
4.5 KiB
Rust
166 lines
4.5 KiB
Rust
use gpui::{svg, Action, Hsla};
|
|
use ui::prelude::*;
|
|
|
|
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
|
|
pub enum WindowControlType {
|
|
Minimize,
|
|
Restore,
|
|
Maximize,
|
|
Close,
|
|
}
|
|
|
|
impl WindowControlType {
|
|
/// Returns the icon name for the window control type.
|
|
///
|
|
/// Will take a [PlatformStyle] in the future to return a different
|
|
/// icon name based on the platform.
|
|
pub fn icon(&self) -> IconName {
|
|
match self {
|
|
WindowControlType::Minimize => IconName::GenericMinimize,
|
|
WindowControlType::Restore => IconName::GenericRestore,
|
|
WindowControlType::Maximize => IconName::GenericMaximize,
|
|
WindowControlType::Close => IconName::GenericClose,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[allow(unused)]
|
|
pub struct WindowControlStyle {
|
|
background: Hsla,
|
|
background_hover: Hsla,
|
|
icon: Hsla,
|
|
icon_hover: Hsla,
|
|
}
|
|
|
|
impl WindowControlStyle {
|
|
pub fn default(cx: &mut App) -> Self {
|
|
let colors = cx.theme().colors();
|
|
|
|
Self {
|
|
background: colors.ghost_element_background,
|
|
background_hover: colors.ghost_element_hover,
|
|
icon: colors.icon,
|
|
icon_hover: colors.icon_muted,
|
|
}
|
|
}
|
|
|
|
#[allow(unused)]
|
|
/// Sets the background color of the control.
|
|
pub fn background(mut self, color: impl Into<Hsla>) -> Self {
|
|
self.background = color.into();
|
|
self
|
|
}
|
|
|
|
#[allow(unused)]
|
|
/// Sets the background color of the control when hovered.
|
|
pub fn background_hover(mut self, color: impl Into<Hsla>) -> Self {
|
|
self.background_hover = color.into();
|
|
self
|
|
}
|
|
|
|
#[allow(unused)]
|
|
/// Sets the color of the icon.
|
|
pub fn icon(mut self, color: impl Into<Hsla>) -> Self {
|
|
self.icon = color.into();
|
|
self
|
|
}
|
|
|
|
#[allow(unused)]
|
|
/// Sets the color of the icon when hovered.
|
|
pub fn icon_hover(mut self, color: impl Into<Hsla>) -> Self {
|
|
self.icon_hover = color.into();
|
|
self
|
|
}
|
|
}
|
|
|
|
#[derive(IntoElement)]
|
|
pub struct WindowControl {
|
|
id: ElementId,
|
|
icon: WindowControlType,
|
|
style: WindowControlStyle,
|
|
close_action: Option<Box<dyn Action>>,
|
|
}
|
|
|
|
impl WindowControl {
|
|
pub fn new(id: impl Into<ElementId>, icon: WindowControlType, cx: &mut App) -> Self {
|
|
let style = WindowControlStyle::default(cx);
|
|
|
|
Self {
|
|
id: id.into(),
|
|
icon,
|
|
style,
|
|
close_action: None,
|
|
}
|
|
}
|
|
|
|
pub fn new_close(
|
|
id: impl Into<ElementId>,
|
|
icon: WindowControlType,
|
|
close_action: Box<dyn Action>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let style = WindowControlStyle::default(cx);
|
|
|
|
Self {
|
|
id: id.into(),
|
|
icon,
|
|
style,
|
|
close_action: Some(close_action.boxed_clone()),
|
|
}
|
|
}
|
|
|
|
#[allow(unused)]
|
|
pub fn custom_style(
|
|
id: impl Into<ElementId>,
|
|
icon: WindowControlType,
|
|
style: WindowControlStyle,
|
|
) -> Self {
|
|
Self {
|
|
id: id.into(),
|
|
icon,
|
|
style,
|
|
close_action: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for WindowControl {
|
|
fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
|
|
let icon = svg()
|
|
.size_4()
|
|
.flex_none()
|
|
.path(self.icon.icon().path())
|
|
.text_color(self.style.icon)
|
|
.group_hover("", |this| this.text_color(self.style.icon_hover));
|
|
|
|
h_flex()
|
|
.id(self.id)
|
|
.group("")
|
|
.cursor_pointer()
|
|
.justify_center()
|
|
.content_center()
|
|
.rounded_2xl()
|
|
.w_5()
|
|
.h_5()
|
|
.hover(|this| this.bg(self.style.background_hover))
|
|
.active(|this| this.bg(self.style.background_hover))
|
|
.child(icon)
|
|
.on_mouse_move(|_, _, cx| cx.stop_propagation())
|
|
.on_click(move |_, window, cx| {
|
|
cx.stop_propagation();
|
|
match self.icon {
|
|
WindowControlType::Minimize => window.minimize_window(),
|
|
WindowControlType::Restore => window.zoom_window(),
|
|
WindowControlType::Maximize => window.zoom_window(),
|
|
WindowControlType::Close => window.dispatch_action(
|
|
self.close_action
|
|
.as_ref()
|
|
.expect("Use WindowControl::new_close() for close control.")
|
|
.boxed_clone(),
|
|
cx,
|
|
),
|
|
}
|
|
})
|
|
}
|
|
}
|