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

Outline some unfinished elements

Browse source
This commit is contained in:
Nate Butler 2023-11-24 08:58:49 -05:00
parent 700168467e
commit 7e61d340ce
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/collab_ui2/src/collab_titlebar_item.rs
View file

@ -111,6 +111,8 @@ impl Render for CollabTitlebarItem {
// TODO - Add player menu // TODO - Add player menu
.child( .child(
div() div()
.border()
.border_color(gpui::red())
.id("project_owner_indicator") .id("project_owner_indicator")
.child( .child(
Button::new("player") Button::new("player")
@ -122,6 +124,8 @@ impl Render for CollabTitlebarItem {
// TODO - Add project menu // TODO - Add project menu
.child( .child(
div() div()
.border()
.border_color(gpui::red())
.id("titlebar_project_menu_button") .id("titlebar_project_menu_button")
.child(Button::new("project_name").variant(ButtonVariant::Ghost)) .child(Button::new("project_name").variant(ButtonVariant::Ghost))
.tooltip(move |cx| Tooltip::text("Recent Projects", cx)), .tooltip(move |cx| Tooltip::text("Recent Projects", cx)),
@ -129,6 +133,8 @@ impl Render for CollabTitlebarItem {
// TODO - Add git menu // TODO - Add git menu
.child( .child(
div() div()
.border()
.border_color(gpui::red())
.id("titlebar_git_menu_button") .id("titlebar_git_menu_button")
.child( .child(
Button::new("branch_name") Button::new("branch_name")

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

@ -37,7 +37,7 @@ impl RenderOnce for IconButton {
}; };
if self.selected { if self.selected {
bg_color = bg_hover_color; bg_color = cx.theme().colors().element_selected;
} }
let mut button = h_stack() let mut button = h_stack()

18
crates/workspace2/src/toolbar.rs
View file

@ -1,6 +1,6 @@
use crate::ItemHandle; use crate::ItemHandle;
use gpui::{ use gpui::{
AnyView, Div, Entity, EntityId, EventEmitter, ParentElement as _, Render, Styled, View, div, AnyView, Div, Entity, EntityId, EventEmitter, ParentElement as _, Render, Styled, View,
ViewContext, WindowContext, ViewContext, WindowContext,
}; };
use theme2::ActiveTheme; use theme2::ActiveTheme;
@ -91,6 +91,8 @@ impl Render for Toolbar {
.child( .child(
// Toolbar left side // Toolbar left side
h_stack() h_stack()
.border()
.border_color(gpui::red())
.p_1() .p_1()
.child(Button::new("crates")) .child(Button::new("crates"))
.child(Label::new("/").color(Color::Muted)) .child(Label::new("/").color(Color::Muted))
@ -100,8 +102,18 @@ impl Render for Toolbar {
.child( .child(
h_stack() h_stack()
.p_1() .p_1()
.child(IconButton::new("buffer-search", Icon::MagnifyingGlass)) .child(
.child(IconButton::new("inline-assist", Icon::MagicWand)), div()
.border()
.border_color(gpui::red())
.child(IconButton::new("buffer-search", Icon::MagnifyingGlass)),
)
.child(
div()
.border()
.border_color(gpui::red())
.child(IconButton::new("inline-assist", Icon::MagicWand)),
),
), ),
) )
.children(self.items.iter().map(|(child, _)| child.to_any())) .children(self.items.iter().map(|(child, _)| child.to_any()))