f084e20c56
Closes #ISSUE Problem: - The status bar’s pending keystroke indicator (shown next to --NORMAL-- in Vim mode) didn’t clear when focus moved to another context, e.g. hitting g in the editor then clicking the Git panel. The keymap state correctly canceled the prefix, but observers that render the indicator never received a “pending input changed” notification, so the UI kept showing stale prefixes until a new keystroke occurred. Fix: - The change introduces a `pending_input_changed_queued` flag and a new helper `notify_pending_input_if_needed` which will flushes the queued notification as soon as we have an App context. The `pending_input_changed` now resets the flag after notifying subscribers. Before: https://github.com/user-attachments/assets/7bec4c34-acbf-42bd-b0d1-88df5ff099aa After: https://github.com/user-attachments/assets/2264dc93-3405-4d63-ad8f-50ada6733ae7 Release Notes: - Fixed: pending keybinding prefixes on the status bar now clear immediately when focus moves to another panel or UI context. --------- Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
83 lines
2.3 KiB
Rust
83 lines
2.3 KiB
Rust
use gpui::{
|
|
App, Application, Bounds, Context, FocusHandle, KeyBinding, Window, WindowBounds,
|
|
WindowOptions, actions, div, prelude::*, px, rgb, size,
|
|
};
|
|
|
|
actions!(example, [CloseWindow]);
|
|
|
|
struct ExampleWindow {
|
|
focus_handle: FocusHandle,
|
|
}
|
|
|
|
impl Render for ExampleWindow {
|
|
fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
|
|
div()
|
|
.on_action(|_: &CloseWindow, window, _| {
|
|
window.remove_window();
|
|
})
|
|
.track_focus(&self.focus_handle)
|
|
.flex()
|
|
.flex_col()
|
|
.gap_3()
|
|
.bg(rgb(0x505050))
|
|
.size(px(500.0))
|
|
.justify_center()
|
|
.items_center()
|
|
.shadow_lg()
|
|
.border_1()
|
|
.border_color(rgb(0x0000ff))
|
|
.text_xl()
|
|
.text_color(rgb(0xffffff))
|
|
.child(
|
|
"Closing this window with cmd-w or the traffic lights should quit the application!",
|
|
)
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
Application::new().run(|cx: &mut App| {
|
|
let mut bounds = Bounds::centered(None, size(px(500.), px(500.0)), cx);
|
|
|
|
cx.bind_keys([KeyBinding::new("cmd-w", CloseWindow, None)]);
|
|
cx.on_window_closed(|cx| {
|
|
if cx.windows().is_empty() {
|
|
cx.quit();
|
|
}
|
|
})
|
|
.detach();
|
|
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(WindowBounds::Windowed(bounds)),
|
|
..Default::default()
|
|
},
|
|
|window, cx| {
|
|
cx.activate(false);
|
|
cx.new(|cx| {
|
|
let focus_handle = cx.focus_handle();
|
|
focus_handle.focus(window, cx);
|
|
ExampleWindow { focus_handle }
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
|
|
bounds.origin.x += bounds.size.width;
|
|
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(WindowBounds::Windowed(bounds)),
|
|
..Default::default()
|
|
},
|
|
|window, cx| {
|
|
cx.new(|cx| {
|
|
let focus_handle = cx.focus_handle();
|
|
focus_handle.focus(window, cx);
|
|
ExampleWindow { focus_handle }
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
});
|
|
}
|