Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Rename layout phase methods and give each a state

Browse source 
Shred mode. I don't want to force things to be optional just to account for both phases though.
This commit is contained in:
Nathan Sobo 2024-02-27 20:08:35 -07:00
parent d5766dc69f
commit 5790d9ba27
17 changed files with 261 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ui/src/components/popover_menu.rs
View file

@ -166,9 +166,10 @@ pub struct PopoverMenuFrameState {
}
impl<M: ManagedView> Element for PopoverMenu<M> {
type FrameState = PopoverMenuFrameState;
type BeforeLayout = PopoverMenuFrameState;
type AfterLayout = ();
fn before_layout(&mut self, cx: &mut ElementContext) -> (gpui::LayoutId, Self::FrameState) {
fn before_layout(&mut self, cx: &mut ElementContext) -> (gpui::LayoutId, Self::BeforeLayout) {
self.with_element_state(cx, |this, element_state, cx| {
let mut menu_layout_id = None;
@ -213,19 +214,19 @@ impl<M: ManagedView> Element for PopoverMenu<M> {
fn after_layout(
&mut self,
_bounds: Bounds<Pixels>,
frame_state: &mut Self::FrameState,
before_layout: &mut Self::BeforeLayout,
cx: &mut ElementContext,
) {
self.with_element_state(cx, |_this, element_state, cx| {
if let Some(child) = frame_state.child_element.as_mut() {
if let Some(child) = before_layout.child_element.as_mut() {
child.after_layout(cx);
}
if let Some(child_layout_id) = frame_state.child_layout_id.as_ref() {
if let Some(child_layout_id) = before_layout.child_layout_id.as_ref() {
element_state.child_bounds = Some(cx.layout_bounds(*child_layout_id));
}
if let Some(menu) = frame_state.menu_element.as_mut() {
if let Some(menu) = before_layout.menu_element.as_mut() {
menu.after_layout(cx);
}
})
@ -234,15 +235,16 @@ impl<M: ManagedView> Element for PopoverMenu<M> {
fn paint(
&mut self,
_: Bounds<gpui::Pixels>,
frame_state: &mut Self::FrameState,
before_layout: &mut Self::BeforeLayout,
_: &mut Self::AfterLayout,
cx: &mut ElementContext,
) {
self.with_element_state(cx, |_this, element_state, cx| {
if let Some(mut child) = frame_state.child_element.take() {
if let Some(mut child) = before_layout.child_element.take() {
child.paint(cx);
}
if let Some(mut menu) = frame_state.menu_element.take() {
if let Some(mut menu) = before_layout.menu_element.take() {
menu.paint(cx);
if let Some(child_bounds) = element_state.child_bounds {