zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use local player selection color, not cursor, for terminal selection

Browse Source
This commit is contained in:
Julia 2024-02-12 10:40:26 -05:00 committed by Julia
parent 0fb6b32bc3
commit d959719f3e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/editor/src/element.rs
View File

@ -1015,13 +1015,13 @@ impl EditorElement {
let corner_radius = 0.15 * layout.position_map.line_height; let corner_radius = 0.15 * layout.position_map.line_height;
let mut invisible_display_ranges = SmallVec::<[Range<DisplayPoint>; 32]>::new(); let mut invisible_display_ranges = SmallVec::<[Range<DisplayPoint>; 32]>::new();
for (participant_ix, (selection_style, selections)) in for (participant_ix, (player_color, selections)) in
layout.selections.iter().enumerate() layout.selections.iter().enumerate()
{ {
for selection in selections.into_iter() { for selection in selections.into_iter() {
self.paint_highlighted_range( self.paint_highlighted_range(
selection.range.clone(), selection.range.clone(),
selection_style.selection, player_color.selection,
corner_radius, corner_radius,
corner_radius * 2., corner_radius * 2.,
layout, layout,
@ -1102,7 +1102,7 @@ impl EditorElement {
} }
cursors.push(Cursor { cursors.push(Cursor {
color: selection_style.cursor, color: player_color.cursor,
block_width, block_width,
origin: point(x, y), origin: point(x, y),
line_height: layout.position_map.line_height, line_height: layout.position_map.line_height,

4
crates/terminal_view/src/terminal_element.rs
View File

@ -447,7 +447,7 @@ impl TerminalElement {
}; };
let text_system = cx.text_system(); let text_system = cx.text_system();
let selection_color = theme.players().local(); let player_color = theme.players().local();
let match_color = theme.colors().search_match_background; let match_color = theme.colors().search_match_background;
let gutter; let gutter;
let dimensions = { let dimensions = {
@ -526,7 +526,7 @@ impl TerminalElement {
} }
if let Some(selection) = selection { if let Some(selection) = selection {
relative_highlighted_ranges relative_highlighted_ranges
.push((selection.start..=selection.end, selection_color.cursor)); .push((selection.start..=selection.end, player_color.selection));
} }
// then have that representation be converted to the appropriate highlight data structure // then have that representation be converted to the appropriate highlight data structure