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

Merge branch 'main' into managed-view-adjustment

Browse source
This commit is contained in:
Mikayla 2023-11-17 12:40:44 -08:00
commit 149b9d1aa6
No known key found for this signature in database
18 changed files with 330 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/go_to_line2/src/go_to_line.rs
View file

@ -1,8 +1,8 @@
use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Editor};
use gpui::{
actions, div, prelude::*, AppContext, Div, EventEmitter, FocusHandle, FocusableView,
ManagedEvent, ParentComponent, Render, SharedString, Styled, Subscription, View, ViewContext,
VisualContext, WindowContext,
actions, div, prelude::*, AppContext, Div, EventEmitter, FocusHandle, FocusableView, Manager,
ParentComponent, Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext,
WindowContext,
};
use text::{Bias, Point};
use theme::ActiveTheme;
@ -29,7 +29,7 @@ impl FocusableView for GoToLine {
self.active_editor.focus_handle(cx)
}
}
impl EventEmitter<ManagedEvent> for GoToLine {}
impl EventEmitter<Manager> for GoToLine {}
impl GoToLine {
fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
@ -89,7 +89,7 @@ impl GoToLine {
) {
match event {
// todo!() this isn't working...
editor::Event::Blurred => cx.emit(ManagedEvent::Dismiss),
editor::Event::Blurred => cx.emit(Manager::Dismiss),
editor::Event::BufferEdited { .. } => self.highlight_current_line(cx),
_ => {}
}
@ -124,7 +124,7 @@ impl GoToLine {
}
fn cancel(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
cx.emit(ManagedEvent::Dismiss);
cx.emit(Manager::Dismiss);
}
fn confirm(&mut self, _: &menu::Confirm, cx: &mut ViewContext<Self>) {
@ -141,7 +141,7 @@ impl GoToLine {
self.prev_scroll_position.take();
}
cx.emit(ManagedEvent::Dismiss);
cx.emit(Manager::Dismiss);
}
}