kitt
038041cc87
This is a follow-up PR to https://github.com/zed-industries/zed/pull/39609, and attempts to address hidden status bar items still contributing to the layout and creating extra spacing.  - 203cbd634bfb1489b8afa4952d9594615a956b77 Adds a `.none()` method to the `gpui::Styled` helper trait, so that status items can set their display type to none inside their `render` method. - 249f06e3de63b0ab32814f20e7105d8e2b642f02 Applies `.none()` to all the status items. - ~~499f564906c88336608c81615b11ebc9ab43d832~~ At first I was adding an `is_visible` method to the `StatusBarView` trait, which would be used to skip status bar items which would just render an empty div anyway, but I felt duplicating the conditions for hiding the buttons between the status items `is_visible` and `render` methods could be an attraction for bugs, so I tried to find another approach. This commit contains those changes, reverted immediately (if the `is_visible` approach is preferred I can bring it back!) - f37cb75f0519ceea1f3e1cc4f97087a5cb34b0fd (bonus!) Adds a condition to the vim mode indicator to avoid a leading space when there are no pending keys. Release Notes: - N/A
92 lines
3.0 KiB
Rust
92 lines
3.0 KiB
Rust
use editor::Editor;
|
|
use gpui::{
|
|
Context, Entity, IntoElement, ParentElement, Render, Styled, Subscription, WeakEntity, Window,
|
|
div,
|
|
};
|
|
use language::LanguageName;
|
|
use settings::Settings as _;
|
|
use ui::{Button, ButtonCommon, Clickable, FluentBuilder, LabelSize, Tooltip};
|
|
use workspace::{StatusBarSettings, StatusItemView, Workspace, item::ItemHandle};
|
|
|
|
use crate::{LanguageSelector, Toggle};
|
|
|
|
pub struct ActiveBufferLanguage {
|
|
active_language: Option<Option<LanguageName>>,
|
|
workspace: WeakEntity<Workspace>,
|
|
_observe_active_editor: Option<Subscription>,
|
|
}
|
|
|
|
impl ActiveBufferLanguage {
|
|
pub fn new(workspace: &Workspace) -> Self {
|
|
Self {
|
|
active_language: None,
|
|
workspace: workspace.weak_handle(),
|
|
_observe_active_editor: None,
|
|
}
|
|
}
|
|
|
|
fn update_language(&mut self, editor: Entity<Editor>, _: &mut Window, cx: &mut Context<Self>) {
|
|
self.active_language = Some(None);
|
|
|
|
let editor = editor.read(cx);
|
|
if let Some((_, buffer, _)) = editor.active_excerpt(cx)
|
|
&& let Some(language) = buffer.read(cx).language()
|
|
{
|
|
self.active_language = Some(Some(language.name()));
|
|
}
|
|
|
|
cx.notify();
|
|
}
|
|
}
|
|
|
|
impl Render for ActiveBufferLanguage {
|
|
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
if !StatusBarSettings::get_global(cx).active_language_button {
|
|
return div().hidden();
|
|
}
|
|
|
|
div().when_some(self.active_language.as_ref(), |el, active_language| {
|
|
let active_language_text = if let Some(active_language_text) = active_language {
|
|
active_language_text.to_string()
|
|
} else {
|
|
"Unknown".to_string()
|
|
};
|
|
|
|
el.child(
|
|
Button::new("change-language", active_language_text)
|
|
.label_size(LabelSize::Small)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
if let Some(workspace) = this.workspace.upgrade() {
|
|
workspace.update(cx, |workspace, cx| {
|
|
LanguageSelector::toggle(workspace, window, cx)
|
|
});
|
|
}
|
|
}))
|
|
.tooltip(|window, cx| {
|
|
Tooltip::for_action("Select Language", &Toggle, window, cx)
|
|
}),
|
|
)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl StatusItemView for ActiveBufferLanguage {
|
|
fn set_active_pane_item(
|
|
&mut self,
|
|
active_pane_item: Option<&dyn ItemHandle>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
|
|
self._observe_active_editor =
|
|
Some(cx.observe_in(&editor, window, Self::update_language));
|
|
self.update_language(editor, window, cx);
|
|
} else {
|
|
self.active_language = None;
|
|
self._observe_active_editor = None;
|
|
}
|
|
|
|
cx.notify();
|
|
}
|
|
}
|