oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ui: Color cleanup (#26673)" (#26681)

Browse Source 
This reverts commit 6767e98e00.

Somehow that PR automerged itself even with failed CI checks.

Release Notes:

- N/A
This commit is contained in:
Nate Butler
2025-03-13 15:40:57 +00:00
committed by GitHub
parent 87cdb68cca
commit b75964a636
20 changed files with 161 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui/src/components/button/button.rs
+4 -4
View File
@@ -3,8 +3,8 @@ use gpui::{AnyElement, AnyView, DefiniteLength};
use ui_macros::IntoComponent;
use crate::{
prelude::*, Color, DynamicSpacing, Elevation, IconPosition, KeyBinding, KeybindingPosition,
TintColor,
prelude::*, Color, DynamicSpacing, ElevationIndex, IconPosition, KeyBinding,
KeybindingPosition, TintColor,
};
use crate::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle, IconName, IconSize, Label};
@@ -394,8 +394,8 @@ impl ButtonCommon for Button {
self
}
fn elevation(mut self, elevation: Elevation) -> Self {
self.base = self.base.elevation(elevation);
fn layer(mut self, elevation: ElevationIndex) -> Self {
self.base = self.base.layer(elevation);
self
}
}
crates/ui/src/components/button/button_like.rs
+22 -12
View File
@@ -2,7 +2,7 @@ use gpui::{relative, CursorStyle, DefiniteLength, MouseButton};
use gpui::{transparent_black, AnyElement, AnyView, ClickEvent, Hsla, Rems};
use smallvec::SmallVec;
use crate::{prelude::*, DynamicSpacing, Elevation};
use crate::{prelude::*, DynamicSpacing, ElevationIndex};
/// A trait for buttons that can be Selected. Enables setting the [`ButtonStyle`] of a button when it is selected.
pub trait SelectableButton: Toggleable {
@@ -34,7 +34,7 @@ pub trait ButtonCommon: Clickable + Disableable {
/// exceptions might a scroll bar, or a slider.
fn tooltip(self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self;
fn elevation(self, elevation: Elevation) -> Self;
fn layer(self, elevation: ElevationIndex) -> Self;
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
@@ -152,18 +152,23 @@ pub(crate) struct ButtonLikeStyles {
pub icon_color: Hsla,
}
fn element_bg_from_elevation(elevation: Option<Elevation>, cx: &mut App) -> Hsla {
fn element_bg_from_elevation(elevation: Option<ElevationIndex>, cx: &mut App) -> Hsla {
match elevation {
Some(Elevation::Background) => cx.theme().colors().element_background,
Some(Elevation::ElevatedSurface) => cx.theme().colors().elevated_surface_background,
Some(Elevation::Surface) => cx.theme().colors().surface_background,
Some(Elevation::ModalSurface) => cx.theme().colors().background,
Some(ElevationIndex::Background) => cx.theme().colors().element_background,
Some(ElevationIndex::ElevatedSurface) => cx.theme().colors().elevated_surface_background,
Some(ElevationIndex::Surface) => cx.theme().colors().surface_background,
Some(ElevationIndex::ModalSurface) => cx.theme().colors().background,
_ => cx.theme().colors().element_background,
}
}
impl ButtonStyle {
pub(crate) fn enabled(self, elevation: Option<Elevation>, cx: &mut App) -> ButtonLikeStyles {
pub(crate) fn enabled(
self,
elevation: Option<ElevationIndex>,
cx: &mut App,
) -> ButtonLikeStyles {
match self {
ButtonStyle::Filled => ButtonLikeStyles {
background: element_bg_from_elevation(elevation, cx),
@@ -187,7 +192,12 @@ impl ButtonStyle {
}
}
pub(crate) fn hovered(self, elevation: Option<Elevation>, cx: &mut App) -> ButtonLikeStyles {
pub(crate) fn hovered(
self,
elevation: Option<ElevationIndex>,
cx: &mut App,
) -> ButtonLikeStyles {
match self {
ButtonStyle::Filled => {
let mut filled_background = element_bg_from_elevation(elevation, cx);
@@ -277,7 +287,7 @@ impl ButtonStyle {
#[allow(unused)]
pub(crate) fn disabled(
self,
elevation: Option<Elevation>,
elevation: Option<ElevationIndex>,
window: &mut Window,
cx: &mut App,
) -> ButtonLikeStyles {
@@ -343,7 +353,7 @@ pub struct ButtonLike {
pub(super) selected_style: Option<ButtonStyle>,
pub(super) width: Option<DefiniteLength>,
pub(super) height: Option<DefiniteLength>,
pub(super) layer: Option<Elevation>,
pub(super) layer: Option<ElevationIndex>,
size: ButtonSize,
rounding: Option<ButtonLikeRounding>,
tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
@@ -462,7 +472,7 @@ impl ButtonCommon for ButtonLike {
self
}
fn elevation(mut self, elevation: Elevation) -> Self {
fn layer(mut self, elevation: ElevationIndex) -> Self {
self.layer = Some(elevation);
self
}
crates/ui/src/components/button/icon_button.rs
+19 -19
View File
@@ -1,7 +1,7 @@
use gpui::{AnyView, DefiniteLength, Hsla};
use super::button_like::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle};
use crate::{prelude::*, Elevation, Indicator, SelectableButton, TintColor};
use crate::{prelude::*, ElevationIndex, Indicator, SelectableButton, TintColor};
use crate::{IconName, IconSize};
use super::button_icon::ButtonIcon;
@@ -156,8 +156,8 @@ impl ButtonCommon for IconButton {
self
}
fn elevation(mut self, elevation: Elevation) -> Self {
self.base = self.base.elevation(elevation);
fn layer(mut self, elevation: ElevationIndex) -> Self {
self.base = self.base.layer(elevation);
self
}
}
@@ -212,34 +212,34 @@ impl ComponentPreview for IconButton {
single_example(
"Default",
IconButton::new("default", IconName::Check)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
"Filled",
IconButton::new("filled", IconName::Check)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.into_any_element(),
),
single_example(
"Subtle",
IconButton::new("subtle", IconName::Check)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Subtle)
.into_any_element(),
),
single_example(
"Tinted",
IconButton::new("tinted", IconName::Check)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent))
.into_any_element(),
),
single_example(
"Transparent",
IconButton::new("transparent", IconName::Check)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Transparent)
.into_any_element(),
),
@@ -253,7 +253,7 @@ impl ComponentPreview for IconButton {
IconButton::new("square", IconName::Check)
.shape(IconButtonShape::Square)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -261,7 +261,7 @@ impl ComponentPreview for IconButton {
IconButton::new("wide", IconName::Check)
.shape(IconButtonShape::Wide)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
],
@@ -274,7 +274,7 @@ impl ComponentPreview for IconButton {
IconButton::new("small", IconName::Check)
.icon_size(IconSize::XSmall)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -282,7 +282,7 @@ impl ComponentPreview for IconButton {
IconButton::new("small", IconName::Check)
.icon_size(IconSize::Small)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -290,7 +290,7 @@ impl ComponentPreview for IconButton {
IconButton::new("medium", IconName::Check)
.icon_size(IconSize::Medium)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -298,7 +298,7 @@ impl ComponentPreview for IconButton {
IconButton::new("xlarge", IconName::Check)
.icon_size(IconSize::XLarge)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
],
@@ -311,7 +311,7 @@ impl ComponentPreview for IconButton {
IconButton::new("disabled", IconName::Check)
.disabled(true)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -319,7 +319,7 @@ impl ComponentPreview for IconButton {
IconButton::new("selected", IconName::Check)
.toggle_state(true)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -327,7 +327,7 @@ impl ComponentPreview for IconButton {
IconButton::new("indicator", IconName::Check)
.indicator(Indicator::dot().color(Color::Success))
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
],
@@ -340,7 +340,7 @@ impl ComponentPreview for IconButton {
IconButton::new("custom_color", IconName::Check)
.icon_color(Color::Accent)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
single_example(
@@ -348,7 +348,7 @@ impl ComponentPreview for IconButton {
IconButton::new("alpha", IconName::Check)
.alpha(0.5)
.style(ButtonStyle::Filled)
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.into_any_element(),
),
],
crates/ui/src/components/button/toggle_button.rs
+15 -15
View File
@@ -1,6 +1,6 @@
use gpui::{AnyView, ClickEvent};
use crate::{prelude::*, ButtonLike, ButtonLikeRounding, Elevation};
use crate::{prelude::*, ButtonLike, ButtonLikeRounding, ElevationIndex};
/// The position of a [`ToggleButton`] within a group of buttons.
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -110,8 +110,8 @@ impl ButtonCommon for ToggleButton {
self
}
fn elevation(mut self, elevation: Elevation) -> Self {
self.base = self.base.elevation(elevation);
fn layer(mut self, elevation: ElevationIndex) -> Self {
self.base = self.base.layer(elevation);
self
}
}
@@ -154,14 +154,14 @@ impl ComponentPreview for ToggleButton {
single_example(
"Off",
ToggleButton::new("off", "Off")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.into_any_element(),
),
single_example(
"On",
ToggleButton::new("on", "On")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.toggle_state(true)
.style(ButtonStyle::Filled)
.into_any_element(),
@@ -169,7 +169,7 @@ impl ComponentPreview for ToggleButton {
single_example(
"Off – Disabled",
ToggleButton::new("disabled_off", "Disabled Off")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.disabled(true)
.style(ButtonStyle::Filled)
.into_any_element(),
@@ -177,7 +177,7 @@ impl ComponentPreview for ToggleButton {
single_example(
"On – Disabled",
ToggleButton::new("disabled_on", "Disabled On")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.disabled(true)
.toggle_state(true)
.style(ButtonStyle::Filled)
@@ -193,14 +193,14 @@ impl ComponentPreview for ToggleButton {
h_flex()
.child(
ToggleButton::new("three_btn_first", "First")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.first()
.into_any_element(),
)
.child(
ToggleButton::new("three_btn_middle", "Middle")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.middle()
.toggle_state(true)
@@ -208,7 +208,7 @@ impl ComponentPreview for ToggleButton {
)
.child(
ToggleButton::new("three_btn_last", "Last")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.last()
.into_any_element(),
@@ -220,14 +220,14 @@ impl ComponentPreview for ToggleButton {
h_flex()
.child(
ToggleButton::new("two_btn_first", "First")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.first()
.into_any_element(),
)
.child(
ToggleButton::new("two_btn_last", "Last")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.last()
.into_any_element(),
@@ -242,7 +242,7 @@ impl ComponentPreview for ToggleButton {
single_example(
"None",
ToggleButton::new("none", "None")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.size(ButtonSize::None)
.into_any_element(),
@@ -250,7 +250,7 @@ impl ComponentPreview for ToggleButton {
single_example(
"Compact",
ToggleButton::new("compact", "Compact")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.size(ButtonSize::Compact)
.into_any_element(),
@@ -258,7 +258,7 @@ impl ComponentPreview for ToggleButton {
single_example(
"Large",
ToggleButton::new("large", "Large")
.elevation(Elevation::Background)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Filled)
.size(ButtonSize::Large)
.into_any_element(),