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

Add setting to disable the call icon

Browse source
This commit is contained in:
Kay Simmons 2023-02-01 16:21:53 -08:00
parent 460dc62888
commit a50f0181fb
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/settings/default.json
View file

@ -20,6 +20,8 @@
// Whether to pop the completions menu while typing in an editor without // Whether to pop the completions menu while typing in an editor without
// explicitly requesting it. // explicitly requesting it.
"show_completions_on_input": true, "show_completions_on_input": true,
// Whether the screen sharing icon is showed in the os status bar.
"show_call_status_icon": true,
// Whether new projects should start out 'online'. Online projects // Whether new projects should start out 'online'. Online projects
// appear in the contacts panel under your name, so that your contacts // appear in the contacts panel under your name, so that your contacts
// can see which projects you are working on. Regardless of this // can see which projects you are working on. Regardless of this

14
crates/call/src/call.rs
View file

@ -2,19 +2,23 @@ mod indicator;
pub mod participant; pub mod participant;
pub mod room; pub mod room;
use std::sync::Arc;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use client::{proto, Client, TypedEnvelope, User, UserStore}; use client::{proto, Client, TypedEnvelope, User, UserStore};
use collections::HashSet; use collections::HashSet;
use postage::watch;
use gpui::{ use gpui::{
actions, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext, actions, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext,
Subscription, Task, ViewHandle, WeakModelHandle, Subscription, Task, ViewHandle, WeakModelHandle,
}; };
use project::Project;
use settings::Settings;
use indicator::SharingStatusIndicator; use indicator::SharingStatusIndicator;
pub use participant::ParticipantLocation; pub use participant::ParticipantLocation;
use postage::watch;
use project::Project;
pub use room::Room; pub use room::Room;
use std::sync::Arc;
actions!(collab, [ToggleScreenSharing]); actions!(collab, [ToggleScreenSharing]);
@ -315,7 +319,9 @@ impl ActiveCall {
pub fn set_sharing_status(&mut self, is_screen_sharing: bool, cx: &mut MutableAppContext) { pub fn set_sharing_status(&mut self, is_screen_sharing: bool, cx: &mut MutableAppContext) {
if is_screen_sharing { if is_screen_sharing {
if self.sharing_status_indicator.is_none() { if self.sharing_status_indicator.is_none()
&& cx.global::<Settings>().show_call_status_icon
{
self.sharing_status_indicator = self.sharing_status_indicator =
Some(cx.add_status_bar_item(|_| SharingStatusIndicator)); Some(cx.add_status_bar_item(|_| SharingStatusIndicator));
} }