Skip to content

Consume escape keystroke when bailing out from a drag operation #5433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abey79 merged 2 commits into from
Dec 4, 2024
Merged

Consume escape keystroke when bailing out from a drag operation #5433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16d2c8c
Consume escape keystroke when cancelling from a drag-and-drop
abey79 Dec 4, 2024
e7bc274
Merge branch 'master' into antoine/dnd-consume-escape
abey79 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions crates/egui/src/drag_and_drop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,30 @@ pub struct DragAndDrop {

impl DragAndDrop {
pub(crate) fn register(ctx: &Context) {
ctx.on_end_pass("debug_text", std::sync::Arc::new(Self::end_pass));
ctx.on_begin_pass("drag_and_drop_begin_pass", Arc::new(Self::begin_pass));
ctx.on_end_pass("drag_and_drop_end_pass", Arc::new(Self::end_pass));
}

fn end_pass(ctx: &Context) {
let abort_dnd =
ctx.input(|i| i.pointer.any_released() || i.key_pressed(crate::Key::Escape));

let mut is_dragging = false;
fn begin_pass(ctx: &Context) {
let has_any_payload = Self::has_any_payload(ctx);

ctx.data_mut(|data| {
let state = data.get_temp_mut_or_default::<Self>(Id::NULL);
if has_any_payload {
let abort_dnd = ctx.input_mut(|i| {
i.pointer.any_released()
|| i.consume_key(crate::Modifiers::NONE, crate::Key::Escape)
});

if abort_dnd {
state.payload = None;
Self::clear_payload(ctx);
}
}
}

fn end_pass(ctx: &Context) {
let mut is_dragging = false;

ctx.data_mut(|data| {
let state = data.get_temp_mut_or_default::<Self>(Id::NULL);
is_dragging = state.payload.is_some();
});

Expand Down
Loading