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

Merge branch 'main' into fix-nondeterministic-terminal-test

Browse source
This commit is contained in:
Mikayla Maki 2023-04-22 11:17:06 +12:00 • committed by GitHub
commit 8e0d359c63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
93 changed files with 1599 additions and 1892 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/terminal_view/src/terminal_element.rs
View file

@ -10,7 +10,7 @@ use gpui::{
platform::{CursorStyle, MouseButton},
serde_json::json,
text_layout::{Line, RunStyle},
Drawable, Element, EventContext, FontCache, ModelContext, MouseRegion, Quad, SceneBuilder,
AnyElement, Element, EventContext, FontCache, ModelContext, MouseRegion, Quad, SceneBuilder,
SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle,
};
use itertools::Itertools;
@ -45,7 +45,7 @@ pub struct LayoutState {
size: TerminalSize,
mode: TermMode,
display_offset: usize,
hyperlink_tooltip: Option<Element<TerminalView>>,
hyperlink_tooltip: Option<AnyElement<TerminalView>>,
gutter: f32,
}
@ -552,7 +552,7 @@ impl TerminalElement {
}
}
impl Drawable<TerminalView> for TerminalElement {
impl Element<TerminalView> for TerminalElement {
type LayoutState = LayoutState;
type PaintState = ();
@ -605,11 +605,10 @@ impl Drawable<TerminalView> for TerminalElement {
.constrained()
.with_width(dimensions.width())
.with_height(dimensions.height())
.with_tooltip::<TerminalElement>(id, uri, None, tooltip_style, cx)
.boxed(),
.with_tooltip::<TerminalElement>(id, uri, None, tooltip_style, cx),
)
.with_position_mode(gpui::elements::OverlayPositionMode::Local)
.boxed();
.into_any();
tooltip.layout(
SizeConstraint::new(Vector2F::zero(), cx.window_size()),