Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove usages of theme::color_alpha

Browse source
This commit is contained in:
Nate Butler 2024-11-19 00:24:37 -05:00
parent 0e26d22fea
commit c0d11be75f
4 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/assistant/src/assistant_panel.rs
View file

@ -2625,8 +2625,8 @@ impl ContextEditor {
.px_1() .px_1()
.mr_0p5() .mr_0p5()
.border_1() .border_1()
.border_color(theme::color_alpha(colors.border_variant, 0.6)) .border_color(colors.border_variant.opacity(0.6))
.bg(theme::color_alpha(colors.element_background, 0.6)) .bg(colors.element_background.opacity(0.6))
.child("esc"), .child("esc"),
) )
.child("to cancel") .child("to cancel")

5
crates/extensions_ui/src/components/extension_card.rs
View file

@ -52,10 +52,7 @@ impl RenderOnce for ExtensionCard {
.size_full() .size_full()
.items_center() .items_center()
.justify_center() .justify_center()
.bg(theme::color_alpha( .bg(cx.theme().colors().elevated_surface_background.opacity(0.8))
cx.theme().colors().elevated_surface_background,
0.8,
))
.child(Label::new("Overridden by dev extension.")), .child(Label::new("Overridden by dev extension.")),
) )
}), }),

4
crates/outline/src/outline.rs
View file

@ -17,7 +17,7 @@ use language::{Outline, OutlineItem};
use ordered_float::OrderedFloat; use ordered_float::OrderedFloat;
use picker::{Picker, PickerDelegate}; use picker::{Picker, PickerDelegate};
use settings::Settings; use settings::Settings;
use theme::{color_alpha, ActiveTheme, ThemeSettings}; use theme::{ActiveTheme, ThemeSettings};
use ui::{prelude::*, ListItem, ListItemSpacing}; use ui::{prelude::*, ListItem, ListItemSpacing};
use util::ResultExt; use util::ResultExt;
use workspace::{DismissDecision, ModalView}; use workspace::{DismissDecision, ModalView};
@ -297,7 +297,7 @@ pub fn render_item<T>(
cx: &AppContext, cx: &AppContext,
) -> StyledText { ) -> StyledText {
let highlight_style = HighlightStyle { let highlight_style = HighlightStyle {
background_color: Some(color_alpha(cx.theme().colors().text_accent, 0.3)), background_color: Some(cx.theme().colors().text_accent.opacity(0.3)),
..Default::default() ..Default::default()
}; };
let custom_highlights = match_ranges let custom_highlights = match_ranges

8
crates/theme/src/theme.rs
View file

@ -333,14 +333,6 @@ impl Theme {
} }
} }
/// Compounds a color with an alpha value.
/// TODO: Replace this with a method on Hsla.
pub fn color_alpha(color: Hsla, alpha: f32) -> Hsla {
let mut color = color;
color.a = alpha;
color
}
/// Asynchronously reads the user theme from the specified path. /// Asynchronously reads the user theme from the specified path.
pub async fn read_user_theme(theme_path: &Path, fs: Arc<dyn Fs>) -> Result<ThemeFamilyContent> { pub async fn read_user_theme(theme_path: &Path, fs: Arc<dyn Fs>) -> Result<ThemeFamilyContent> {
let reader = fs.open_sync(theme_path).await?; let reader = fs.open_sync(theme_path).await?;