Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve toggle UI, fix inlays update speed

Browse source
This commit is contained in:
Kirill Bulatov 2023-08-10 12:28:17 +03:00
parent 6a326c1bd8
commit 0b93e490a5
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/editor/src/editor.rs
View file

@ -1240,7 +1240,7 @@ enum GotoDefinitionKind {
#[derive(Debug, Clone)]
enum InlayRefreshReason {
Toggled(bool),
Toggle(bool),
SettingsChange(InlayHintSettings),
NewLinesShown,
BufferEdited(HashSet<Arc<Language>>),
@ -2673,11 +2673,10 @@ impl Editor {
}
pub fn toggle_inlays(&mut self, _: &ToggleInlays, cx: &mut ViewContext<Self>) {
self.inlay_hint_cache.enabled = !self.inlay_hint_cache.enabled;
self.refresh_inlays(
InlayRefreshReason::Toggled(self.inlay_hint_cache.enabled),
InlayRefreshReason::Toggle(!self.inlay_hint_cache.enabled),
cx,
)
);
}
pub fn inlays_enabled(&self) -> bool {
@ -2690,7 +2689,8 @@ impl Editor {
}
let (invalidate_cache, required_languages) = match reason {
InlayRefreshReason::Toggled(enabled) => {
InlayRefreshReason::Toggle(enabled) => {
self.inlay_hint_cache.enabled = enabled;
if enabled {
(InvalidationStrategy::RefreshRequested, None)
} else {
@ -2805,6 +2805,7 @@ impl Editor {
self.display_map.update(cx, |display_map, cx| {
display_map.splice_inlays(to_remove, to_insert, cx);
});
cx.notify();
}
fn trigger_on_type_formatting(

10
crates/zed/src/quick_action_bar.rs
View file

@ -45,10 +45,7 @@ impl View for QuickActionBar {
0,
"icons/hamburger_15.svg",
inlays_enabled,
(
"Toggle inlays".to_string(),
Some(Box::new(editor::ToggleInlays)),
),
("Inlays".to_string(), Some(Box::new(editor::ToggleInlays))),
cx,
|this, cx| {
if let Some(editor) = this.active_editor() {
@ -78,7 +75,8 @@ impl View for QuickActionBar {
"icons/magnifying_glass_12.svg",
search_bar_shown,
(
"Toggle buffer search".to_string(),
"Buffer search".to_string(),
// TODO kb no keybinding is shown for search + toggle inlays does not update icon color
Some(Box::new(search_action.clone())),
),
cx,
@ -132,6 +130,8 @@ fn render_quick_action_bar_button<
.constrained()
.with_width(style.button_width)
.with_height(style.button_width)
.contained()
.with_style(style.container)
})
.with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, pane, cx| on_click(pane, cx))