ZacharyZhang-NY
4c3ed1bbb9
gpui and gpui_platform now come from Zed's repo by git at 1a28cff, the code gpui-pre 0.3.7 republishes, so the gallery can later build for the browser. gpui takes stacker, as 0.2.2 always did, and gpui_platform takes font-kit, without which macOS draws no text; runtime_shaders moves to gpui_platform. The API moved: focus, blur and Tab steps take cx, Corner is Anchor, shaped lines paint with an alignment, defer_draw takes a content mask, the inspector registers a factory, async updates return their value, and wrapped lines are shared, not cloned. Updates through a window context go through the window, so a closed window still ends them as it did. Where the new gpui behaves differently, Ely keeps its old intent. Holds and reveals under a resting pointer survive typing through gpui's input-modality-independent hover; previews the keyboard also moves keep the default, and the calendar's leave ignores a key press. Enter reaches a button inside the code editor, since gpui now arms a key click on the press. The event logger skips a lone modifier. A video and an image grid keep their shape in a flex column under taffy 0.13, as a picture does. AGENTS.md records the new stack and the rules this port changes; the rest of the old gpui and taffy rules are re-tested in T44c.
111 lines
3.5 KiB
Rust
111 lines
3.5 KiB
Rust
use std::rc::Rc;
|
|
|
|
use gpui::{
|
|
App, ElementId, InteractiveElement, IntoElement, Keystroke, ParentElement, RenderOnce, Styled,
|
|
Window, div, prelude::*,
|
|
};
|
|
|
|
use crate::{
|
|
primitives::{FocusRing, Icon, IconName},
|
|
theme::{ActiveTheme, ControlSize, IconSize, Radius, TextSize},
|
|
typography::KbdCombo,
|
|
};
|
|
|
|
type OnChange = Rc<dyn Fn(Option<Keystroke>, &mut Window, &mut App)>;
|
|
|
|
/// Records one shortcut, then lets go. Backspace clears; Escape leaves.
|
|
#[derive(IntoElement)]
|
|
pub struct HotkeyInput {
|
|
id: ElementId,
|
|
value: Option<Keystroke>,
|
|
on_change: Option<OnChange>,
|
|
}
|
|
|
|
impl HotkeyInput {
|
|
pub fn new(id: impl Into<ElementId>, value: Option<Keystroke>) -> Self {
|
|
Self {
|
|
id: id.into(),
|
|
value,
|
|
on_change: None,
|
|
}
|
|
}
|
|
|
|
pub fn on_change(
|
|
mut self,
|
|
handler: impl Fn(Option<Keystroke>, &mut Window, &mut App) + 'static,
|
|
) -> Self {
|
|
self.on_change = Some(Rc::new(handler));
|
|
self
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for HotkeyInput {
|
|
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
|
|
let focus = window
|
|
.use_keyed_state(self.id.clone(), cx, |_, cx| {
|
|
cx.focus_handle().tab_stop(true)
|
|
})
|
|
.read(cx)
|
|
.clone();
|
|
let recording = focus.is_focused(window);
|
|
let theme = cx.theme();
|
|
let colors = &theme.colors;
|
|
let on_change = self.on_change;
|
|
div()
|
|
.id(self.id)
|
|
.track_focus(&focus)
|
|
.flex()
|
|
.items_center()
|
|
.justify_between()
|
|
.gap_2()
|
|
.h(theme.control_height(ControlSize::Md))
|
|
.px(theme.control_padding(ControlSize::Md))
|
|
.rounded(theme.radius(Radius::Md))
|
|
.border_1()
|
|
.border_color(colors.border_strong)
|
|
.bg(colors.surface)
|
|
.focus_ring(cx)
|
|
.cursor_pointer()
|
|
.text_size(theme.text_size(TextSize::Base))
|
|
.on_key_down(move |event, window, cx| {
|
|
cx.stop_propagation();
|
|
let stroke = &event.keystroke;
|
|
let bare = !stroke.modifiers.modified();
|
|
let next = match stroke.key.as_str() {
|
|
"escape" if bare => {
|
|
window.blur(cx);
|
|
return;
|
|
}
|
|
"backspace" | "delete" if bare => None,
|
|
_ => Some(Keystroke {
|
|
key_char: None,
|
|
..stroke.clone()
|
|
}),
|
|
};
|
|
log::info!(
|
|
"hotkey input: {}",
|
|
next.as_ref()
|
|
.map_or("cleared".into(), |stroke| stroke.unparse())
|
|
);
|
|
window.blur(cx);
|
|
if let Some(on_change) = &on_change {
|
|
on_change(next, window, cx);
|
|
}
|
|
})
|
|
.map(|field| match (&self.value, recording) {
|
|
(_, true) => field.child(
|
|
div()
|
|
.text_color(colors.fg_subtle)
|
|
.child("Press a shortcut…"),
|
|
),
|
|
(Some(stroke), false) => field.child(KbdCombo::new(&stroke.unparse())),
|
|
(None, false) => field.child(div().text_color(colors.fg_subtle).child("None")),
|
|
})
|
|
.child(
|
|
Icon::new(IconName::Keyboard)
|
|
.size(IconSize::Sm)
|
|
.color(colors.fg_subtle),
|
|
)
|
|
}
|
|
}
|