zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-13 06:39:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2228 from zed-industries/make-folds-show-on-active-lines

Browse Source 
Made code fold indicators show up on active line indicators
This commit is contained in:
Mikayla Maki 2023-02-28 20:01:09 -08:00 committed by GitHub
commit 8358efbd6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2702,6 +2702,7 @@ impl Editor {
pub fn render_fold_indicators(
&self,
fold_data: Option<Vec<(u32, FoldStatus)>>,
active_rows: &BTreeMap<u32, bool>,
style: &EditorStyle,
gutter_hovered: bool,
line_height: f32,
@ -2717,7 +2718,10 @@ impl Editor {
.iter()
.copied()
.filter_map(|(fold_location, fold_status)| {
(gutter_hovered || fold_status == FoldStatus::Folded).then(|| {
(gutter_hovered
|| fold_status == FoldStatus::Folded
|| !*active_rows.get(&fold_location).unwrap_or(&true))
.then(|| {
(
fold_location,
MouseEventHandler::<FoldIndicators>::new(

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

@ -1858,6 +1858,7 @@ impl Element for EditorElement {
view.render_fold_indicators(
folds,
&active_rows,
&style,
view.gutter_hovered,
line_height,