diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs index 21b3a69407..85d3acbc98 100644 --- a/crates/editor/src/code_context_menus.rs +++ b/crates/editor/src/code_context_menus.rs @@ -126,16 +126,15 @@ impl CodeContextMenu { &self, style: &EditorStyle, max_height_in_lines: u32, - y_flipped: bool, window: &mut Window, cx: &mut Context, ) -> AnyElement { match self { CodeContextMenu::Completions(menu) => { - menu.render(style, max_height_in_lines, y_flipped, window, cx) + menu.render(style, max_height_in_lines, window, cx) } CodeContextMenu::CodeActions(menu) => { - menu.render(style, max_height_in_lines, y_flipped, window, cx) + menu.render(style, max_height_in_lines, window, cx) } } } @@ -439,7 +438,6 @@ impl CompletionsMenu { &self, style: &EditorStyle, max_height_in_lines: u32, - y_flipped: bool, window: &mut Window, cx: &mut Context, ) -> AnyElement { @@ -589,7 +587,6 @@ impl CompletionsMenu { .occlude() .max_h(max_height_in_lines as f32 * window.line_height()) .track_scroll(self.scroll_handle.clone()) - .y_flipped(y_flipped) .with_width_from_item(widest_completion_ix) .with_sizing_behavior(ListSizingBehavior::Infer); @@ -978,7 +975,6 @@ impl CodeActionsMenu { &self, _style: &EditorStyle, max_height_in_lines: u32, - y_flipped: bool, window: &mut Window, cx: &mut Context, ) -> AnyElement { @@ -1068,7 +1064,6 @@ impl CodeActionsMenu { .occlude() .max_h(max_height_in_lines as f32 * window.line_height()) .track_scroll(self.scroll_handle.clone()) - .y_flipped(y_flipped) .with_width_from_item( self.actions .iter() diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 5299e6c9d4..9ef6a969aa 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -7702,7 +7702,6 @@ impl Editor { &self, style: &EditorStyle, max_height_in_lines: u32, - y_flipped: bool, window: &mut Window, cx: &mut Context, ) -> Option { @@ -7711,7 +7710,7 @@ impl Editor { if !menu.visible() { return None; }; - Some(menu.render(style, max_height_in_lines, y_flipped, window, cx)) + Some(menu.render(style, max_height_in_lines, window, cx)) } fn render_context_menu_aside( diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 3b8e61bfd1..4ec4ad12e6 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -3351,7 +3351,7 @@ impl EditorElement { height - height_above_menu }; let mut element = self - .render_context_menu(line_height, menu_height, y_flipped, window, cx) + .render_context_menu(line_height, menu_height, window, cx) .expect("Visible context menu should always render."); let size = element.layout_as_root(AvailableSpace::min_size(), window, cx); Some((CursorPopoverType::CodeContextMenu, element, size)) @@ -3508,9 +3508,9 @@ impl EditorElement { viewport_bounds, window, cx, - move |height, _max_width_for_stable_x, y_flipped, window, cx| { + move |height, _max_width_for_stable_x, _, window, cx| { let mut element = self - .render_context_menu(line_height, height, y_flipped, window, cx) + .render_context_menu(line_height, height, window, cx) .expect("Visible context menu should always render."); let size = element.layout_as_root(AvailableSpace::min_size(), window, cx); vec![(CursorPopoverType::CodeContextMenu, element, size)] @@ -3740,13 +3740,12 @@ impl EditorElement { &self, line_height: Pixels, height: Pixels, - y_flipped: bool, window: &mut Window, cx: &mut App, ) -> Option { let max_height_in_lines = ((height - POPOVER_Y_PADDING) / line_height).floor() as u32; self.editor.update(cx, |editor, cx| { - editor.render_context_menu(&self.style, max_height_in_lines, y_flipped, window, cx) + editor.render_context_menu(&self.style, max_height_in_lines, window, cx) }) }