f658af5903
This PR makes the `border` methods require an explicit width instead of
defaulting to 1px.
This breaks convention with Tailwind, but it makes GPUI more consistent
with itself. We already have an edge case where the parameterized method
had to be named `border_width`, since `border` was taken up by an alias
for the 1px variant.
### Before
```rs
div()
.border()
.border_t()
.border_r()
.border_b()
.border_l()
.border_width(px(7.))
```
### After
```rs
div()
.border_1()
.border_t_1()
.border_r_1()
.border_b_1()
.border_l_1()
.border(px(7.))
```
Release Notes:
- N/A
102 lines
4 KiB
Rust
102 lines
4 KiB
Rust
use gpui::{hsla, px, Styled, WindowContext};
|
|
|
|
use crate::prelude::*;
|
|
use crate::ElevationIndex;
|
|
|
|
fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E {
|
|
this.bg(cx.theme().colors().elevated_surface_background)
|
|
.rounded(px(8.))
|
|
.border_1()
|
|
.border_color(cx.theme().colors().border_variant)
|
|
.shadow(index.shadow())
|
|
}
|
|
|
|
/// Extends [`gpui::Styled`] with Zed-specific styling methods.
|
|
pub trait StyledExt: Styled + Sized {
|
|
/// Horizontally stacks elements.
|
|
///
|
|
/// Sets `flex()`, `flex_row()`, `items_center()`
|
|
fn h_flex(self) -> Self {
|
|
self.flex().flex_row().items_center()
|
|
}
|
|
|
|
/// Vertically stacks elements.
|
|
///
|
|
/// Sets `flex()`, `flex_col()`
|
|
fn v_flex(self) -> Self {
|
|
self.flex().flex_col()
|
|
}
|
|
|
|
/// The [`Surface`](ElevationIndex::Surface) elevation level, located above the app background, is the standard level for all elements
|
|
///
|
|
/// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
|
|
///
|
|
/// Example Elements: Title Bar, Panel, Tab Bar, Editor
|
|
fn elevation_1(self, cx: &mut WindowContext) -> Self {
|
|
elevated(self, cx, ElevationIndex::Surface)
|
|
}
|
|
|
|
/// Non-Modal Elevated Surfaces appear above the [`Surface`](ElevationIndex::Surface) layer and is used for things that should appear above most UI elements like an editor or panel, but not elements like popovers, context menus, modals, etc.
|
|
///
|
|
/// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
|
|
///
|
|
/// Examples: Notifications, Palettes, Detached/Floating Windows, Detached/Floating Panels
|
|
fn elevation_2(self, cx: &mut WindowContext) -> Self {
|
|
elevated(self, cx, ElevationIndex::ElevatedSurface)
|
|
}
|
|
|
|
/// Modal Surfaces are used for elements that should appear above all other UI elements and are located above the wash layer. This is the maximum elevation at which UI elements can be rendered in their default state.
|
|
///
|
|
/// Elements rendered at this layer should have an enforced behavior: Any interaction outside of the modal will either dismiss the modal or prompt an action (Save your progress, etc) then dismiss the modal.
|
|
///
|
|
/// If the element does not have this behavior, it should be rendered at the [`Elevated Surface`](ElevationIndex::ElevatedSurface) layer.
|
|
///
|
|
/// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
|
|
///
|
|
/// Examples: Settings Modal, Channel Management, Wizards/Setup UI, Dialogs
|
|
fn elevation_3(self, cx: &mut WindowContext) -> Self {
|
|
elevated(self, cx, ElevationIndex::ModalSurface)
|
|
}
|
|
|
|
/// The theme's primary border color.
|
|
fn border_primary(self, cx: &mut WindowContext) -> Self {
|
|
self.border_color(cx.theme().colors().border)
|
|
}
|
|
|
|
/// The theme's secondary or muted border color.
|
|
fn border_muted(self, cx: &mut WindowContext) -> Self {
|
|
self.border_color(cx.theme().colors().border_variant)
|
|
}
|
|
|
|
/// Sets the background color to red for debugging when building UI.
|
|
fn debug_bg_red(self) -> Self {
|
|
self.bg(hsla(0. / 360., 1., 0.5, 1.))
|
|
}
|
|
|
|
/// Sets the background color to green for debugging when building UI.
|
|
fn debug_bg_green(self) -> Self {
|
|
self.bg(hsla(120. / 360., 1., 0.5, 1.))
|
|
}
|
|
|
|
/// Sets the background color to blue for debugging when building UI.
|
|
fn debug_bg_blue(self) -> Self {
|
|
self.bg(hsla(240. / 360., 1., 0.5, 1.))
|
|
}
|
|
|
|
/// Sets the background color to yellow for debugging when building UI.
|
|
fn debug_bg_yellow(self) -> Self {
|
|
self.bg(hsla(60. / 360., 1., 0.5, 1.))
|
|
}
|
|
|
|
/// Sets the background color to cyan for debugging when building UI.
|
|
fn debug_bg_cyan(self) -> Self {
|
|
self.bg(hsla(160. / 360., 1., 0.5, 1.))
|
|
}
|
|
|
|
/// Sets the background color to magenta for debugging when building UI.
|
|
fn debug_bg_magenta(self) -> Self {
|
|
self.bg(hsla(300. / 360., 1., 0.5, 1.))
|
|
}
|
|
}
|
|
|
|
impl<E: Styled> StyledExt for E {}
|