mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 02:20:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

start adding setting for the screen sharing status indicator

Browse source
This commit is contained in:
Kay Simmons 2023-01-31 15:17:16 -08:00
parent e35db69dbd
commit 460dc62888
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -828,6 +828,7 @@ dependencies = [
"media", "media",
"postage", "postage",
"project", "project",
"settings",
"util", "util",
] ]

1
crates/call/Cargo.toml
View file

@ -28,6 +28,7 @@ fs = { path = "../fs" }
language = { path = "../language" } language = { path = "../language" }
media = { path = "../media" } media = { path = "../media" }
project = { path = "../project" } project = { path = "../project" }
settings = { path = "../settings" }
util = { path = "../util" } util = { path = "../util" }
anyhow = "1.0.38" anyhow = "1.0.38"

2
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -10,7 +10,7 @@ use gpui::{
geometry::{rect::RectF, vector::vec2f, PathBuilder}, geometry::{rect::RectF, vector::vec2f, PathBuilder},
json::{self, ToJson}, json::{self, ToJson},
Border, CursorStyle, Entity, ModelHandle, MouseButton, MutableAppContext, RenderContext, Border, CursorStyle, Entity, ModelHandle, MouseButton, MutableAppContext, RenderContext,
Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle, Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
}; };
use settings::Settings; use settings::Settings;
use std::ops::Range; use std::ops::Range;

5
crates/settings/src/settings.rs
View file

@ -35,6 +35,7 @@ pub struct Settings {
pub confirm_quit: bool, pub confirm_quit: bool,
pub hover_popover_enabled: bool, pub hover_popover_enabled: bool,
pub show_completions_on_input: bool, pub show_completions_on_input: bool,
pub show_call_status_icon: bool,
pub vim_mode: bool, pub vim_mode: bool,
pub autosave: Autosave, pub autosave: Autosave,
pub default_dock_anchor: DockAnchor, pub default_dock_anchor: DockAnchor,
@ -287,6 +288,8 @@ pub struct SettingsFileContent {
#[serde(default)] #[serde(default)]
pub show_completions_on_input: Option<bool>, pub show_completions_on_input: Option<bool>,
#[serde(default)] #[serde(default)]
pub show_call_status_icon: Option<bool>,
#[serde(default)]
pub vim_mode: Option<bool>, pub vim_mode: Option<bool>,
#[serde(default)] #[serde(default)]
pub autosave: Option<Autosave>, pub autosave: Option<Autosave>,
@ -346,6 +349,7 @@ impl Settings {
cursor_blink: defaults.cursor_blink.unwrap(), cursor_blink: defaults.cursor_blink.unwrap(),
hover_popover_enabled: defaults.hover_popover_enabled.unwrap(), hover_popover_enabled: defaults.hover_popover_enabled.unwrap(),
show_completions_on_input: defaults.show_completions_on_input.unwrap(), show_completions_on_input: defaults.show_completions_on_input.unwrap(),
show_call_status_icon: defaults.show_call_status_icon.unwrap(),
vim_mode: defaults.vim_mode.unwrap(), vim_mode: defaults.vim_mode.unwrap(),
autosave: defaults.autosave.unwrap(), autosave: defaults.autosave.unwrap(),
default_dock_anchor: defaults.default_dock_anchor.unwrap(), default_dock_anchor: defaults.default_dock_anchor.unwrap(),
@ -540,6 +544,7 @@ impl Settings {
cursor_blink: true, cursor_blink: true,
hover_popover_enabled: true, hover_popover_enabled: true,
show_completions_on_input: true, show_completions_on_input: true,
show_call_status_icon: true,
vim_mode: false, vim_mode: false,
autosave: Autosave::Off, autosave: Autosave::Off,
default_dock_anchor: DockAnchor::Bottom, default_dock_anchor: DockAnchor::Bottom,