rei-forks/fred
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not reuse render cache for nested items whose parents are re-rendered (#21165)

Browse Source 
Fixes a bug with terminal splits panicking during writing a command in
the command input

Release Notes:

- N/A

Co-authored-by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Kirill Bulatov 2024-11-25 15:58:45 +02:00 committed by GitHub
parent 08b214dfb9
commit b83f104f6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/gpui/src/view.rs
View File

@ -7,6 +7,7 @@ use crate::{
}; };
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use refineable::Refineable; use refineable::Refineable;
use std::mem;
use std::{ use std::{
any::{type_name, TypeId}, any::{type_name, TypeId},
fmt, fmt,
@ -341,11 +342,13 @@ impl Element for AnyView {
} }
} }
let refreshing = mem::replace(&mut cx.window.refreshing, true);
let prepaint_start = cx.prepaint_index(); let prepaint_start = cx.prepaint_index();
let mut element = (self.render)(self, cx); let mut element = (self.render)(self, cx);
element.layout_as_root(bounds.size.into(), cx); element.layout_as_root(bounds.size.into(), cx);
element.prepaint_at(bounds.origin, cx); element.prepaint_at(bounds.origin, cx);
let prepaint_end = cx.prepaint_index(); let prepaint_end = cx.prepaint_index();
cx.window.refreshing = refreshing;
( (
Some(element), Some(element),
@ -382,7 +385,9 @@ impl Element for AnyView {
let paint_start = cx.paint_index(); let paint_start = cx.paint_index();
if let Some(element) = element { if let Some(element) = element {
let refreshing = mem::replace(&mut cx.window.refreshing, true);
element.paint(cx); element.paint(cx);
cx.window.refreshing = refreshing;
} else { } else {
cx.reuse_paint(element_state.paint_range.clone()); cx.reuse_paint(element_state.paint_range.clone());
} }