From 910aeb4f5647d78949898f842826d452cbf80dea Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 1 Dec 2023 11:47:04 -0500 Subject: [PATCH] I'm a dunce --- crates/breadcrumbs2/src/breadcrumbs.rs | 9 ++++----- crates/workspace2/src/toolbar.rs | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/breadcrumbs2/src/breadcrumbs.rs b/crates/breadcrumbs2/src/breadcrumbs.rs index 1df656e43f72aab4894c8fe102acb13ad1852498..75195a315930e2525ed1b01aea36f57e6d30b699 100644 --- a/crates/breadcrumbs2/src/breadcrumbs.rs +++ b/crates/breadcrumbs2/src/breadcrumbs.rs @@ -1,11 +1,10 @@ use gpui::{ - AnyElement, Component, Div, Element, EventEmitter, InteractiveElement, IntoElement, - ParentElement, Render, Stateful, StatefulInteractiveElement, Styled, StyledText, Subscription, + Component, Element, EventEmitter, IntoElement, ParentElement, Render, StyledText, Subscription, ViewContext, WeakView, }; use itertools::Itertools; use theme::ActiveTheme; -use ui::{h_stack, ButtonCommon, ButtonLike, ButtonStyle2, Clickable, Disableable, Label}; +use ui::{ButtonCommon, ButtonLike, ButtonStyle, Clickable, Disableable, Label}; use workspace::{ item::{ItemEvent, ItemHandle}, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, @@ -41,7 +40,7 @@ impl Render for Breadcrumbs { fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let button = ButtonLike::new("breadcrumbs") - .style(ButtonStyle2::Transparent) + .style(ButtonStyle::Transparent) .disabled(true); let active_item = match &self.active_item { @@ -71,7 +70,7 @@ impl Render for Breadcrumbs { // let this = cx.view().downgrade(); button - .style(ButtonStyle2::Filled) + .style(ButtonStyle::Filled) .disabled(false) .on_click(move |_, _cx| { todo!("outline::toggle"); diff --git a/crates/workspace2/src/toolbar.rs b/crates/workspace2/src/toolbar.rs index d93b58132dbad697ea436001d1b10bbc7bf5f706..8c554dcd6744d94fb7c3b0dfb30e40fad5afeadc 100644 --- a/crates/workspace2/src/toolbar.rs +++ b/crates/workspace2/src/toolbar.rs @@ -4,7 +4,7 @@ use gpui::{ ViewContext, WindowContext, }; use ui::prelude::*; -use ui::{h_stack, v_stack, ButtonLike, Color, Icon, IconButton, Label}; +use ui::{h_stack, v_stack, Icon, IconButton}; pub enum ToolbarItemEvent { ChangeLocation(ToolbarItemLocation),