Finn Evers
f393138711
Closes #39172 This refactors when we resolve UI keybindings in an effort to reduce flickering whilst painting these: Previously, we would always resolve these upon creating the binding. This could lead to cases where the corresponding context was not yet available and no binding could be resolved, even if the binding was then available on the next presented frame. Following that, on the next rerender of whatever requested this keybinding, the keybind for that context would then be found, we would render that and then also win a layout shift in that process, as we went from nothing rendered to something rendered between these frames. With these changes, this now happens less often, because we only look for the keybinding once the context can actually be resolved in the window. | Before | After | | --- | --- | | https://github.com/user-attachments/assets/adebf8ac-217d-4c7f-ae5a-bab3aa0b0ee8 | https://github.com/user-attachments/assets/70a82b4b-488f-4a9f-94d7-b6d0a49aada9 | Also reduced cloning in the keymap editor in this process, since that requiered changing due to this anyway. Release Notes: - Fixed some cases where keybinds would appear with a slight delay, causing a flicker in the process
114 lines
3.5 KiB
Rust
114 lines
3.5 KiB
Rust
use std::{path::Path, sync::Arc};
|
|
|
|
use gpui::{EventEmitter, FocusHandle, Focusable};
|
|
use ui::{
|
|
App, Button, ButtonCommon, ButtonStyle, Clickable, Context, FluentBuilder, InteractiveElement,
|
|
KeyBinding, Label, LabelCommon, LabelSize, ParentElement, Render, SharedString, Styled as _,
|
|
Window, h_flex, v_flex,
|
|
};
|
|
use zed_actions::workspace::OpenWithSystem;
|
|
|
|
use crate::Item;
|
|
|
|
/// A view to display when a certain buffer/image/other item fails to open.
|
|
pub struct InvalidItemView {
|
|
/// Which path was attempted to open.
|
|
pub abs_path: Arc<Path>,
|
|
/// An error message, happened when opening the item.
|
|
pub error: SharedString,
|
|
is_local: bool,
|
|
focus_handle: FocusHandle,
|
|
}
|
|
|
|
impl InvalidItemView {
|
|
pub fn new(
|
|
abs_path: &Path,
|
|
is_local: bool,
|
|
e: &anyhow::Error,
|
|
_: &mut Window,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
Self {
|
|
is_local,
|
|
abs_path: Arc::from(abs_path),
|
|
error: format!("{}", e.root_cause()).into(),
|
|
focus_handle: cx.focus_handle(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Item for InvalidItemView {
|
|
type Event = ();
|
|
|
|
fn tab_content_text(&self, mut detail: usize, _: &App) -> SharedString {
|
|
// Ensure we always render at least the filename.
|
|
detail += 1;
|
|
|
|
let path = self.abs_path.as_ref();
|
|
|
|
let mut prefix = path;
|
|
while detail > 0 {
|
|
if let Some(parent) = prefix.parent() {
|
|
prefix = parent;
|
|
detail -= 1;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
let path = if detail > 0 {
|
|
path
|
|
} else {
|
|
path.strip_prefix(prefix).unwrap_or(path)
|
|
};
|
|
|
|
SharedString::new(path.to_string_lossy())
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<()> for InvalidItemView {}
|
|
|
|
impl Focusable for InvalidItemView {
|
|
fn focus_handle(&self, _: &App) -> FocusHandle {
|
|
self.focus_handle.clone()
|
|
}
|
|
}
|
|
|
|
impl Render for InvalidItemView {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl gpui::IntoElement {
|
|
let abs_path = self.abs_path.clone();
|
|
v_flex()
|
|
.size_full()
|
|
.track_focus(&self.focus_handle(cx))
|
|
.flex_none()
|
|
.justify_center()
|
|
.overflow_hidden()
|
|
.key_context("InvalidItem")
|
|
.child(
|
|
h_flex().size_full().justify_center().child(
|
|
v_flex()
|
|
.justify_center()
|
|
.gap_2()
|
|
.child(h_flex().justify_center().child("Could not open file"))
|
|
.child(
|
|
h_flex()
|
|
.justify_center()
|
|
.child(Label::new(self.error.clone()).size(LabelSize::Small)),
|
|
)
|
|
.when(self.is_local, |contents| {
|
|
contents.child(
|
|
h_flex().justify_center().child(
|
|
Button::new("open-with-system", "Open in Default App")
|
|
.on_click(move |_, _, cx| {
|
|
cx.open_with_system(&abs_path);
|
|
})
|
|
.style(ButtonStyle::Outlined)
|
|
.key_binding(KeyBinding::for_action(&OpenWithSystem, cx)),
|
|
),
|
|
)
|
|
}),
|
|
),
|
|
)
|
|
}
|
|
}
|