fix: complete le merge 1.9.0 — roxmltree (detection SVG amont) et is_selecting
checkout --ours sur Cargo.toml avait aussi ecarte l'ajout amont hors zone de conflit ; is_selecting, prefixe _ par le fork, est de nouveau lu en 1.9. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
83dfea34fd
commit
16b4c5372b
2 changed files with 2 additions and 1 deletions
|
|
@ -176,6 +176,7 @@ zbus = { workspace = true, optional = true }
|
||||||
float-cmp = "0.10.0"
|
float-cmp = "0.10.0"
|
||||||
ron = { workspace = true, optional = true }
|
ron = { workspace = true, optional = true }
|
||||||
enumflags2 = "0.7.12"
|
enumflags2 = "0.7.12"
|
||||||
|
roxmltree = "0.20"
|
||||||
|
|
||||||
# Enable DBus feature on Linux targets
|
# Enable DBus feature on Linux targets
|
||||||
[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
|
[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
|
||||||
|
|
|
||||||
|
|
@ -2752,7 +2752,7 @@ pub fn draw<'a, Message>(
|
||||||
let handling_dnd_offer = !matches!(state.dnd_offer, DndOfferState::None);
|
let handling_dnd_offer = !matches!(state.dnd_offer, DndOfferState::None);
|
||||||
#[cfg(not(wayland_platform))]
|
#[cfg(not(wayland_platform))]
|
||||||
let handling_dnd_offer = false;
|
let handling_dnd_offer = false;
|
||||||
let (cursors, offset, _is_selecting) = if let Some(focus) =
|
let (cursors, offset, is_selecting) = if let Some(focus) =
|
||||||
state.is_focused.filter(|f| f.focused).or_else(|| {
|
state.is_focused.filter(|f| f.focused).or_else(|| {
|
||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
handling_dnd_offer.then_some(Focus {
|
handling_dnd_offer.then_some(Focus {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue