oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Robustify checks for visibility

Browse Source
This commit is contained in:
Conrad Irwin
2023-12-14 10:02:54 -07:00
parent 17a80ca09b
commit c2c7eead8a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/gpui2/src/elements/div.rs
+8 -9
View File
@@ -642,10 +642,6 @@ impl Element for Div {
&mut element_state.interactive_state, &mut element_state.interactive_state,
cx, cx,
|style, scroll_offset, cx| { |style, scroll_offset, cx| {
if style.visibility == Visibility::Hidden {
return;
}
let z_index = style.z_index.unwrap_or(0); let z_index = style.z_index.unwrap_or(0);
cx.with_z_index(z_index, |cx| { cx.with_z_index(z_index, |cx| {
@@ -779,6 +775,10 @@ impl Interactivity {
) { ) {
let style = self.compute_style(Some(bounds), element_state, cx); let style = self.compute_style(Some(bounds), element_state, cx);
if style.visibility == Visibility::Hidden {
return;
}
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if self.element_id.is_some() if self.element_id.is_some()
&& (style.debug || style.debug_below || cx.has_global::<crate::DebugBelow>()) && (style.debug || style.debug_below || cx.has_global::<crate::DebugBelow>())
@@ -890,11 +890,10 @@ impl Interactivity {
}); });
} }
if style.visibility == Visibility::Visible if style
&& style .background
.background .as_ref()
.as_ref() .is_some_and(|fill| fill.color().is_some_and(|color| !color.is_transparent()))
.is_some_and(|fill| fill.color().is_some())
{ {
cx.with_z_index(style.z_index.unwrap_or(0), |cx| cx.add_opaque_layer(bounds)) cx.with_z_index(style.z_index.unwrap_or(0), |cx| cx.add_opaque_layer(bounds))
} }