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

Revert "Remove ChannelsAlpha flag"

Browse source 
This reverts commit 1c1151a0ed.
This commit is contained in:
Conrad Irwin 2024-01-10 11:52:33 -07:00
parent 8d1bca450f
commit 61a9a3a274
4 changed files with 118 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/collab_ui/src/chat_panel.rs
View file

@ -1,4 +1,4 @@
use crate::{channel_view::ChannelView, ChatPanelSettings};
use crate::{channel_view::ChannelView, is_channels_feature_enabled, ChatPanelSettings};
use anyhow::Result;
use call::ActiveCall;
use channel::{ChannelChat, ChannelChatEvent, ChannelMessageId, ChannelStore};
@ -612,6 +612,9 @@ impl Panel for ChatPanel {
self.active = active;
if active {
self.acknowledge_last_message(cx);
if !is_channels_feature_enabled(cx) {
cx.emit(Event::Dismissed);
}
}
}
@ -620,6 +623,10 @@ impl Panel for ChatPanel {
}
fn icon(&self, cx: &WindowContext) -> Option<ui::IconName> {
if !is_channels_feature_enabled(cx) {
return None;
}
Some(ui::IconName::MessageBubbles).filter(|_| ChatPanelSettings::get_global(cx).button)
}