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

Keep original focus state while a pane is dragged

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-07-22 03:40:17 +02:00
parent 35b1b8b0e7
commit 3d91926a74
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
native/src/widget/pane_grid/state.rs
View file

@ -335,6 +335,7 @@ pub enum Action {
Dragging { Dragging {
pane: Pane, pane: Pane,
origin: Point, origin: Point,
focus: Option<Pane>,
}, },
Resizing { Resizing {
split: Split, split: Split,
@ -362,7 +363,7 @@ impl Internal {
pub fn focused_pane(&self) -> Option<Pane> { pub fn focused_pane(&self) -> Option<Pane> {
match self.action { match self.action {
Action::Idle { focus } => focus, Action::Idle { focus } => focus,
Action::Dragging { pane, .. } => Some(pane), Action::Dragging { focus, .. } => focus,
Action::Resizing { focus, .. } => focus, Action::Resizing { focus, .. } => focus,
} }
} }
@ -376,7 +377,7 @@ impl Internal {
pub fn picked_pane(&self) -> Option<(Pane, Point)> { pub fn picked_pane(&self) -> Option<(Pane, Point)> {
match self.action { match self.action {
Action::Dragging { pane, origin } => Some((pane, origin)), Action::Dragging { pane, origin, .. } => Some((pane, origin)),
_ => None, _ => None,
} }
} }
@ -409,9 +410,12 @@ impl Internal {
} }
pub fn pick_pane(&mut self, pane: &Pane, origin: Point) { pub fn pick_pane(&mut self, pane: &Pane, origin: Point) {
let focus = self.focused_pane();
self.action = Action::Dragging { self.action = Action::Dragging {
pane: *pane, pane: *pane,
origin, origin,
focus,
}; };
} }