mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 18:46:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Finish main merge

Browse source
This commit is contained in:
Mikayla 2023-11-01 11:52:14 -07:00
parent e82d8eb5b8
commit 6f38eb3252
No known key found for this signature in database
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,8 +82,8 @@ fn main() {
..Default::default() ..Default::default()
}, },
move |cx| { move |cx| {
let theme_settings = ThemeSettings::get_global(cx); let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
cx.set_rem_size(theme_settings.ui_font_size); cx.set_rem_size(ui_font_size);
cx.build_view(|cx| StoryWrapper::new(selector.story(cx))) cx.build_view(|cx| StoryWrapper::new(selector.story(cx)))
}, },

8
crates/workspace2/src/item.rs
View file

@ -21,6 +21,7 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings2::Settings; use settings2::Settings;
use smallvec::SmallVec; use smallvec::SmallVec;
use theme2::ThemeVariant;
use std::{ use std::{
any::{Any, TypeId}, any::{Any, TypeId},
ops::Range, ops::Range,
@ -31,7 +32,6 @@ use std::{
}, },
time::Duration, time::Duration,
}; };
use theme2::Theme;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct ItemSettings { pub struct ItemSettings {
@ -178,7 +178,7 @@ pub trait Item: Render + EventEmitter + Send {
ToolbarItemLocation::Hidden ToolbarItemLocation::Hidden
} }
fn breadcrumbs(&self, _theme: &Theme, _cx: &AppContext) -> Option<Vec<BreadcrumbText>> { fn breadcrumbs(&self, _theme: &ThemeVariant, _cx: &AppContext) -> Option<Vec<BreadcrumbText>> {
None None
} }
@ -259,7 +259,7 @@ pub trait ItemHandle: 'static + Send {
) -> gpui2::Subscription; ) -> gpui2::Subscription;
fn to_searchable_item_handle(&self, cx: &AppContext) -> Option<Box<dyn SearchableItemHandle>>; fn to_searchable_item_handle(&self, cx: &AppContext) -> Option<Box<dyn SearchableItemHandle>>;
fn breadcrumb_location(&self, cx: &AppContext) -> ToolbarItemLocation; fn breadcrumb_location(&self, cx: &AppContext) -> ToolbarItemLocation;
fn breadcrumbs(&self, theme: &Theme, cx: &AppContext) -> Option<Vec<BreadcrumbText>>; fn breadcrumbs(&self, theme: &ThemeVariant, cx: &AppContext) -> Option<Vec<BreadcrumbText>>;
fn serialized_item_kind(&self) -> Option<&'static str>; fn serialized_item_kind(&self) -> Option<&'static str>;
fn show_toolbar(&self, cx: &AppContext) -> bool; fn show_toolbar(&self, cx: &AppContext) -> bool;
fn pixel_position_of_cursor(&self, cx: &AppContext) -> Option<Point<Pixels>>; fn pixel_position_of_cursor(&self, cx: &AppContext) -> Option<Point<Pixels>>;
@ -585,7 +585,7 @@ impl<T: Item> ItemHandle for View<T> {
self.read(cx).breadcrumb_location() self.read(cx).breadcrumb_location()
} }
fn breadcrumbs(&self, theme: &Theme, cx: &AppContext) -> Option<Vec<BreadcrumbText>> { fn breadcrumbs(&self, theme: &ThemeVariant, cx: &AppContext) -> Option<Vec<BreadcrumbText>> {
self.read(cx).breadcrumbs(theme, cx) self.read(cx).breadcrumbs(theme, cx)
} }

8
crates/workspace2/src/pane_group.rs
View file

@ -11,7 +11,7 @@ use parking_lot::Mutex;
use project2::Project; use project2::Project;
use serde::Deserialize; use serde::Deserialize;
use std::sync::Arc; use std::sync::Arc;
use theme2::Theme; use theme2::ThemeVariant;
const HANDLE_HITBOX_SIZE: f32 = 4.0; const HANDLE_HITBOX_SIZE: f32 = 4.0;
const HORIZONTAL_MIN_SIZE: f32 = 80.; const HORIZONTAL_MIN_SIZE: f32 = 80.;
@ -124,7 +124,7 @@ impl PaneGroup {
pub(crate) fn render( pub(crate) fn render(
&self, &self,
project: &Model<Project>, project: &Model<Project>,
theme: &Theme, theme: &ThemeVariant,
follower_states: &HashMap<View<Pane>, FollowerState>, follower_states: &HashMap<View<Pane>, FollowerState>,
active_call: Option<&Model<ActiveCall>>, active_call: Option<&Model<ActiveCall>>,
active_pane: &View<Pane>, active_pane: &View<Pane>,
@ -187,7 +187,7 @@ impl Member {
&self, &self,
project: &Model<Project>, project: &Model<Project>,
basis: usize, basis: usize,
theme: &Theme, theme: &ThemeVariant,
follower_states: &HashMap<View<Pane>, FollowerState>, follower_states: &HashMap<View<Pane>, FollowerState>,
active_call: Option<&Model<ActiveCall>>, active_call: Option<&Model<ActiveCall>>,
active_pane: &View<Pane>, active_pane: &View<Pane>,
@ -510,7 +510,7 @@ impl PaneAxis {
&self, &self,
project: &Model<Project>, project: &Model<Project>,
basis: usize, basis: usize,
theme: &Theme, theme: &ThemeVariant,
follower_states: &HashMap<View<Pane>, FollowerState>, follower_states: &HashMap<View<Pane>, FollowerState>,
active_call: Option<&Model<ActiveCall>>, active_call: Option<&Model<ActiveCall>>,
active_pane: &View<Pane>, active_pane: &View<Pane>,