aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-27 19:27:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3533 from nrq6993-a11y/stream/vc-feat1-3440-color-proxy-drag

Browse Source 
G11: Color Picker and popover Fill/Stroke proxy drags (#3440)
This commit is contained in:
BFlat
2026-10-22 14:42:54 +07:00
committed by GitHub
parent af520a7cf3 36eed1ac77
commit f1dc5e50a3
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/widgets.rs
+10 -4
View File
@@ -1099,10 +1099,16 @@ pub fn popover<R>(resp: &Response, toggle: bool, content: impl FnOnce(&mut Ui) -
!was_open
} else {
// Popups (this one and those it opened) are on foreground layers; a click anywhere
// else closes it.
let clicked_elsewhere = ctx
.input(|i| i.pointer.any_click().then(|| i.pointer.interact_pos()).flatten())
.is_some_and(|pos| ctx.layer_id_at(pos).is_none_or(|l| l.order != egui::Order::Foreground));
// else closes it. While the pointer is down or a panel paint drag is active, keep the
// popover open so a Fill/Stroke proxy drag can finish (#3440).
let pointer_down = ctx.input(|i| i.pointer.any_down());
let panel_drag = egui::DragAndDrop::payload::<PanelDrag>(ctx).is_some();
let click_pos = ctx.input(|i| i.pointer.any_click().then(|| i.pointer.interact_pos()).flatten());
let clicked_anchor = click_pos.is_some_and(|pos| resp.rect.contains(pos));
let clicked_elsewhere = !pointer_down
&& !panel_drag
&& !clicked_anchor
&& click_pos.is_some_and(|pos| ctx.layer_id_at(pos).is_none_or(|l| l.order != egui::Order::Foreground));
was_open && !clicked_elsewhere
};
let inner =