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
51 lines
1.4 KiB
Rust
51 lines
1.4 KiB
Rust
use editor::EditorSettings;
|
|
use settings::Settings as _;
|
|
use ui::{ButtonCommon, Clickable, Context, Render, Tooltip, Window, prelude::*};
|
|
use workspace::{ItemHandle, StatusItemView};
|
|
|
|
pub const SEARCH_ICON: IconName = IconName::MagnifyingGlass;
|
|
|
|
pub struct SearchButton;
|
|
|
|
impl SearchButton {
|
|
pub fn new() -> Self {
|
|
Self {}
|
|
}
|
|
}
|
|
|
|
impl Render for SearchButton {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
|
|
let button = div();
|
|
|
|
if !EditorSettings::get_global(cx).search.button {
|
|
return button.hidden();
|
|
}
|
|
|
|
button.child(
|
|
IconButton::new("project-search-indicator", SEARCH_ICON)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(|window, cx| {
|
|
Tooltip::for_action(
|
|
"Project Search",
|
|
&workspace::DeploySearch::default(),
|
|
window,
|
|
cx,
|
|
)
|
|
})
|
|
.on_click(cx.listener(|_this, _, window, cx| {
|
|
window.dispatch_action(Box::new(workspace::DeploySearch::default()), cx);
|
|
})),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl StatusItemView for SearchButton {
|
|
fn set_active_pane_item(
|
|
&mut self,
|
|
_active_pane_item: Option<&dyn ItemHandle>,
|
|
_window: &mut Window,
|
|
_cx: &mut Context<Self>,
|
|
) {
|
|
}
|
|
}
|