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

Use gpui instead of gpui2 consistenytly

Browse source
This commit is contained in:
Conrad Irwin 2023-11-06 11:46:10 -07:00
parent eb325fb387
commit 496518f3e8
71 changed files with 111 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ui2/src/components/avatar.rs
View file

@ -1,4 +1,4 @@
use gpui2::img;
use gpui::img;
use crate::prelude::*;
@ -33,7 +33,7 @@ impl Avatar {
img.uri(self.src.clone())
.size_4()
// todo!(Pull the avatar fallback background from the theme.)
.bg(gpui2::red())
.bg(gpui::red())
}
}
@ -44,7 +44,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::Story;
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct AvatarStory;

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

@ -1,6 +1,6 @@
use std::sync::Arc;
use gpui2::{div, rems, DefiniteLength, Hsla, MouseButton, WindowContext};
use gpui::{div, rems, DefiniteLength, Hsla, MouseButton, WindowContext};
use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor, LineHeightStyle};
use crate::{prelude::*, IconButton};
@ -234,7 +234,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::{h_stack, v_stack, LabelColor, Story};
use gpui2::{rems, Div, Render};
use gpui::{rems, Div, Render};
use strum::IntoEnumIterator;
pub struct ButtonStory;

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

@ -1,6 +1,6 @@
use std::sync::Arc;
use gpui2::{
use gpui::{
div, Component, ElementId, ParentElement, StatefulInteractive, StatelessInteractive, Styled,
ViewContext,
};
@ -175,7 +175,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::{h_stack, Story};
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct CheckboxStory;

2
crates/ui2/src/components/context_menu.rs
View file

@ -65,7 +65,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::story::Story;
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct ContextMenuStory;

2
crates/ui2/src/components/details.rs
View file

@ -47,7 +47,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::{Button, Story};
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct DetailsStory;

2
crates/ui2/src/components/facepile.rs
View file

@ -33,7 +33,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::{static_players, Story};
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct FacepileStory;

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

@ -1,4 +1,4 @@
use gpui2::{rems, svg, Hsla};
use gpui::{rems, svg, Hsla};
use strum::EnumIter;
use crate::prelude::*;
@ -204,7 +204,7 @@ pub use stories::*;
#[cfg(feature = "stories")]
mod stories {
use gpui2::{Div, Render};
use gpui::{Div, Render};
use strum::IntoEnumIterator;
use crate::Story;

2
crates/ui2/src/components/icon_button.rs
View file

@ -1,6 +1,6 @@
use std::sync::Arc;
use gpui2::{rems, MouseButton};
use gpui::{rems, MouseButton};
use crate::{h_stack, prelude::*};
use crate::{ClickHandler, Icon, IconColor, IconElement};

2
crates/ui2/src/components/indicator.rs
View file

@ -1,4 +1,4 @@
use gpui2::px;
use gpui::px;
use crate::prelude::*;

2
crates/ui2/src/components/input.rs
View file

@ -111,7 +111,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::Story;
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct InputStory;

2
crates/ui2/src/components/keybinding.rs
View file

@ -158,7 +158,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::Story;
use gpui2::{Div, Render};
use gpui::{Div, Render};
use itertools::Itertools;
pub struct KeybindingStory;

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

@ -1,4 +1,4 @@
use gpui2::{relative, rems, Hsla, WindowContext};
use gpui::{relative, rems, Hsla, WindowContext};
use smallvec::SmallVec;
use crate::prelude::*;
@ -194,7 +194,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::Story;
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct LabelStory;

2
crates/ui2/src/components/list.rs
View file

@ -1,4 +1,4 @@
use gpui2::div;
use gpui::div;
use crate::settings::user_settings;
use crate::{

2
crates/ui2/src/components/modal.rs
View file

@ -1,4 +1,4 @@
use gpui2::AnyElement;
use gpui::AnyElement;
use smallvec::SmallVec;
use crate::{h_stack, prelude::*, v_stack, Button, Icon, IconButton, Label};

2
crates/ui2/src/components/notification_toast.rs
View file

@ -1,4 +1,4 @@
use gpui2::rems;
use gpui::rems;
use crate::prelude::*;
use crate::{h_stack, Icon};

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

@ -153,13 +153,13 @@ impl PaletteItem {
}
}
use gpui2::ElementId;
use gpui::ElementId;
#[cfg(feature = "stories")]
pub use stories::*;
#[cfg(feature = "stories")]
mod stories {
use gpui2::{Div, Render};
use gpui::{Div, Render};
use crate::{ModifierKeys, Story};

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

@ -1,4 +1,4 @@
use gpui2::{AbsoluteLength, AnyElement};
use gpui::{AbsoluteLength, AnyElement};
use smallvec::SmallVec;
use crate::prelude::*;
@ -126,7 +126,7 @@ pub use stories::*;
mod stories {
use super::*;
use crate::{Label, Story};
use gpui2::{Div, Render};
use gpui::{Div, Render};
pub struct PanelStory;

2
crates/ui2/src/components/player.rs
View file

@ -1,4 +1,4 @@
use gpui2::{Hsla, ViewContext};
use gpui::{Hsla, ViewContext};
use crate::prelude::*;

2
crates/ui2/src/components/slot.rs
View file

@ -1,4 +1,4 @@
use gpui2::SharedString;
use gpui::SharedString;
use crate::Icon;

2
crates/ui2/src/components/stack.rs
View file

@ -1,4 +1,4 @@
use gpui2::{div, Div};
use gpui::{div, Div};
use crate::prelude::*;

2
crates/ui2/src/components/tab.rs
View file

@ -1,6 +1,6 @@
use crate::prelude::*;
use crate::{Icon, IconColor, IconElement, Label, LabelColor};
use gpui2::{red, Div, ElementId, Render, View, VisualContext};
use gpui::{red, Div, ElementId, Render, View, VisualContext};
#[derive(Component, Clone)]
pub struct Tab {

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

@ -1,4 +1,4 @@
use gpui2::AnyElement;
use gpui::AnyElement;
use smallvec::SmallVec;
use crate::prelude::*;
@ -70,7 +70,7 @@ pub use stories::*;
#[cfg(feature = "stories")]
mod stories {
use gpui2::{Div, Render};
use gpui::{Div, Render};
use crate::{Label, Story};

2
crates/ui2/src/components/toggle.rs
View file

@ -1,4 +1,4 @@
use gpui2::{div, Component, ParentElement};
use gpui::{div, Component, ParentElement};
use crate::{Icon, IconColor, IconElement, IconSize};

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

@ -1,4 +1,4 @@
use gpui2::{div, px, Div, ParentElement, Render, SharedString, Styled, ViewContext};
use gpui::{div, px, Div, ParentElement, Render, SharedString, Styled, ViewContext};
use theme2::ActiveTheme;
#[derive(Clone, Debug)]