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

ui2: Reference theme2 and settings2 crates without the 2 (#3424)

Browse source 
This PR updates the `ui2` crate to reference the `theme2` and
`settings2` crates without the `2` the way we do in our other crates.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-11-28 15:30:29 -05:00 • committed by GitHub
parent d8fd422cf4
commit 64376ad37a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ui2/Cargo.toml
View file

@ -15,11 +15,11 @@ gpui = { package = "gpui2", path = "../gpui2" }
itertools = { version = "0.11.0", optional = true } itertools = { version = "0.11.0", optional = true }
menu = { package = "menu2", path = "../menu2"} menu = { package = "menu2", path = "../menu2"}
serde.workspace = true serde.workspace = true
settings2 = { path = "../settings2" } settings = { package = "settings2", path = "../settings2" }
smallvec.workspace = true smallvec.workspace = true
story = { path = "../story", optional = true } story = { path = "../story", optional = true }
strum = { version = "0.25.0", features = ["derive"] } strum = { version = "0.25.0", features = ["derive"] }
theme2 = { path = "../theme2" } theme = { package = "theme2", path = "../theme2" }
rand = "0.8" rand = "0.8"
[features] [features]

3
crates/ui2/src/components/checkbox.rs
View file

@ -1,7 +1,6 @@
use gpui::{div, prelude::*, Div, Element, ElementId, IntoElement, Styled, WindowContext}; use gpui::{div, prelude::*, Div, Element, ElementId, IntoElement, Styled, WindowContext};
use theme2::ActiveTheme; use crate::prelude::*;
use crate::{Color, Icon, IconElement, Selection}; use crate::{Color, Icon, IconElement, Selection};
pub type CheckHandler = Box<dyn Fn(&Selection, &mut WindowContext) + 'static>; pub type CheckHandler = Box<dyn Fn(&Selection, &mut WindowContext) + 'static>;

4
crates/ui2/src/components/popover.rs
View file

@ -3,9 +3,9 @@ use gpui::{
WindowContext, WindowContext,
}; };
use smallvec::SmallVec; use smallvec::SmallVec;
use theme2::ActiveTheme;
use crate::{v_stack, StyledExt}; use crate::prelude::*;
use crate::v_stack;
/// A popover is used to display a menu or show some options. /// A popover is used to display a menu or show some options.
/// ///

4
crates/ui2/src/components/tooltip.rs
View file

@ -1,6 +1,6 @@
use gpui::{overlay, Action, AnyView, IntoElement, Overlay, Render, VisualContext}; use gpui::{overlay, Action, AnyView, IntoElement, Overlay, Render, VisualContext};
use settings2::Settings; use settings::Settings;
use theme2::{ActiveTheme, ThemeSettings}; use theme::ThemeSettings;
use crate::prelude::*; use crate::prelude::*;
use crate::{h_stack, v_stack, Color, KeyBinding, Label, LabelSize, StyledExt}; use crate::{h_stack, v_stack, Color, KeyBinding, Label, LabelSize, StyledExt};

2
crates/ui2/src/prelude.rs
View file

@ -5,7 +5,7 @@ pub use gpui::{
pub use crate::StyledExt; pub use crate::StyledExt;
pub use crate::{ButtonVariant, Color}; pub use crate::{ButtonVariant, Color};
pub use theme2::ActiveTheme; pub use theme::ActiveTheme;
use strum::EnumIter; use strum::EnumIter;

2
crates/ui2/src/styled_ext.rs
View file

@ -1,6 +1,6 @@
use gpui::{px, Styled, WindowContext}; use gpui::{px, Styled, WindowContext};
use theme2::ActiveTheme;
use crate::prelude::*;
use crate::{ElevationIndex, UITextSize}; use crate::{ElevationIndex, UITextSize};
fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E { fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E {

2
crates/ui2/src/styles/color.rs
View file

@ -1,5 +1,5 @@
use gpui::{Hsla, WindowContext}; use gpui::{Hsla, WindowContext};
use theme2::ActiveTheme; use theme::ActiveTheme;
#[derive(Default, PartialEq, Copy, Clone)] #[derive(Default, PartialEq, Copy, Clone)]
pub enum Color { pub enum Color {