djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[window] Fix: no hover effect when already dragging something

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-11-02 17:45:46 +01:00
parent 9833ca57a6
commit 4c25465e57
1 changed files with 61 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
egui/src/containers/window.rs
View file

@ -468,70 +468,72 @@ fn resize_hover(
area_layer_id: LayerId, area_layer_id: LayerId,
rect: Rect, rect: Rect,
) -> Option<WindowInteraction> { ) -> Option<WindowInteraction> {
if let Some(mouse_pos) = ctx.input().mouse.pos { let mouse_pos = ctx.input().mouse.pos?;
if let Some(top_layer_id) = ctx.layer_id_at(mouse_pos) {
if top_layer_id != area_layer_id && top_layer_id.order != Order::Background { if ctx.input().mouse.down && !ctx.input().mouse.pressed {
return None; // Another window is on top here return None; // already dragging (something)
} }
if let Some(top_layer_id) = ctx.layer_id_at(mouse_pos) {
if top_layer_id != area_layer_id && top_layer_id.order != Order::Background {
return None; // Another window is on top here
}
}
if ctx.memory().interaction.drag_interest {
// Another widget will become active if we drag here
return None;
}
let side_grab_radius = ctx.style().interaction.resize_grab_radius_side;
let corner_grab_radius = ctx.style().interaction.resize_grab_radius_corner;
if !rect.expand(side_grab_radius).contains(mouse_pos) {
return None;
}
let (mut left, mut right, mut top, mut bottom) = Default::default();
if possible.resizable {
right = (rect.right() - mouse_pos.x).abs() <= side_grab_radius;
bottom = (rect.bottom() - mouse_pos.y).abs() <= side_grab_radius;
if rect.right_bottom().distance(mouse_pos) < corner_grab_radius {
right = true;
bottom = true;
} }
if ctx.memory().interaction.drag_interest { if possible.movable {
// Another widget will become active if we drag here left = (rect.left() - mouse_pos.x).abs() <= side_grab_radius;
return None; top = (rect.top() - mouse_pos.y).abs() <= side_grab_radius;
if rect.right_top().distance(mouse_pos) < corner_grab_radius {
right = true;
top = true;
}
if rect.left_top().distance(mouse_pos) < corner_grab_radius {
left = true;
top = true;
}
if rect.left_bottom().distance(mouse_pos) < corner_grab_radius {
left = true;
bottom = true;
}
} }
}
let any_resize = left || right || top || bottom;
let side_grab_radius = ctx.style().interaction.resize_grab_radius_side; if !any_resize && !possible.movable {
let corner_grab_radius = ctx.style().interaction.resize_grab_radius_corner; return None;
if rect.expand(side_grab_radius).contains(mouse_pos) { }
let (mut left, mut right, mut top, mut bottom) = Default::default();
if possible.resizable {
right = (rect.right() - mouse_pos.x).abs() <= side_grab_radius;
bottom = (rect.bottom() - mouse_pos.y).abs() <= side_grab_radius;
if rect.right_bottom().distance(mouse_pos) < corner_grab_radius { if any_resize || possible.movable {
right = true; Some(WindowInteraction {
bottom = true; area_layer_id,
} start_rect: rect,
left,
if possible.movable { right,
left = (rect.left() - mouse_pos.x).abs() <= side_grab_radius; top,
top = (rect.top() - mouse_pos.y).abs() <= side_grab_radius; bottom,
})
if rect.right_top().distance(mouse_pos) < corner_grab_radius {
right = true;
top = true;
}
if rect.left_top().distance(mouse_pos) < corner_grab_radius {
left = true;
top = true;
}
if rect.left_bottom().distance(mouse_pos) < corner_grab_radius {
left = true;
bottom = true;
}
}
}
let any_resize = left || right || top || bottom;
if !any_resize && !possible.movable {
return None;
}
if any_resize || possible.movable {
Some(WindowInteraction {
area_layer_id,
start_rect: rect,
left,
right,
top,
bottom,
})
} else {
None
}
} else {
None
}
} else { } else {
None None
} }