me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #971 from tarkah/fix/pane-dragging-overlay

Browse source 
fix: allow titlebar overlays to close when dragging pane
This commit is contained in:
Héctor Ramón 2021-07-28 15:47:13 +07:00 • committed by GitHub
commit a08e4ebccb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

37
native/src/widget/pane_grid.rs
View file

@ -452,24 +452,25 @@ where
_ => {} _ => {}
} }
if self.state.picked_pane().is_none() { let picked_pane = self.state.picked_pane().map(|(pane, _)| pane);
self.elements
.iter_mut() self.elements
.zip(layout.children()) .iter_mut()
.map(|((_, pane), layout)| { .zip(layout.children())
pane.on_event( .map(|((pane, content), layout)| {
event.clone(), let is_picked = picked_pane == Some(*pane);
layout,
cursor_position, content.on_event(
renderer, event.clone(),
clipboard, layout,
messages, cursor_position,
) renderer,
}) clipboard,
.fold(event_status, event::Status::merge) messages,
} else { is_picked,
event::Status::Captured )
} })
.fold(event_status, event::Status::merge)
} }
fn draw( fn draw(

21
native/src/widget/pane_grid/content.rs
View file

@ -149,6 +149,7 @@ where
renderer: &Renderer, renderer: &Renderer,
clipboard: &mut dyn Clipboard, clipboard: &mut dyn Clipboard,
messages: &mut Vec<Message>, messages: &mut Vec<Message>,
is_picked: bool,
) -> event::Status { ) -> event::Status {
let mut event_status = event::Status::Ignored; let mut event_status = event::Status::Ignored;
@ -169,14 +170,18 @@ where
layout layout
}; };
let body_status = self.body.on_event( let body_status = if is_picked {
event, event::Status::Ignored
body_layout, } else {
cursor_position, self.body.on_event(
renderer, event,
clipboard, body_layout,
messages, cursor_position,
); renderer,
clipboard,
messages,
)
};
event_status.merge(body_status) event_status.merge(body_status)
} }