diff --git a/crates/ui-egui/src/dock_ui.rs b/crates/ui-egui/src/dock_ui.rs index a92d376e..15cc0d8f 100644 --- a/crates/ui-egui/src/dock_ui.rs +++ b/crates/ui-egui/src/dock_ui.rs @@ -341,7 +341,7 @@ impl EffectcraftApp { let mv = ui.interact(strip, id.with("strip"), Sense::drag()); self.auto.add(&format!("panel.float.{i}.move"), strip, "Move floating panel"); let mut nr = r; - if mv.dragged() { + if mv.dragged_by(egui::PointerButton::Primary) { nr = nr.translate(mv.drag_delta()); } let g = Group { @@ -624,7 +624,7 @@ fn floating_resize_delta(ui: &mut egui::Ui, response: &egui::Response) -> egui:: if response.drag_started() { response.request_focus(); } - let mut delta = if response.dragged() { response.drag_delta() } else { egui::Vec2::ZERO }; + let mut delta = if response.dragged_by(egui::PointerButton::Primary) { response.drag_delta() } else { egui::Vec2::ZERO }; if response.has_focus() { ui.memory_mut(|memory| { memory.set_focus_lock_filter(response.id, egui::EventFilter { horizontal_arrows: true, vertical_arrows: true, ..Default::default() }) diff --git a/crates/ui-egui/src/panels/dialogs.rs b/crates/ui-egui/src/panels/dialogs.rs index d773fc43..f9f2e4d2 100644 --- a/crates/ui-egui/src/panels/dialogs.rs +++ b/crates/ui-egui/src/panels/dialogs.rs @@ -206,7 +206,7 @@ pub(crate) fn modal_fit(ctx: &egui::Context, title: &str, size: egui::Vec2, t: & let head = ui.label(egui::RichText::new(tr(title)).font(Tokens::semibold(15.0)).color(t.tab_text_active)); let row = Rect::from_x_y_ranges(ui.max_rect().x_range(), head.rect.y_range()); let grip = ui.interact(row, id.with("grip"), Sense::drag()).on_hover_cursor(egui::CursorIcon::Grab); - if grip.dragged() { + if grip.dragged_by(egui::PointerButton::Primary) { let moved = (offset + grip.drag_delta()).clamp(-room, room); ui.ctx().data_mut(|d| d.insert_temp(offset_id, moved)); } diff --git a/crates/ui-egui/src/panels/effect_controls.rs b/crates/ui-egui/src/panels/effect_controls.rs index bad1db39..f6ef8a94 100644 --- a/crates/ui-egui/src/panels/effect_controls.rs +++ b/crates/ui-egui/src/panels/effect_controls.rs @@ -587,7 +587,7 @@ fn slider_row( p.text(pos2(tr.max.x, tr.max.y + 4.0), Align2::RIGHT_TOP, format!("{slider_max:.dec$}"), Tokens::ui(10.5), t.text_dim); let sresp = ui.interact(tr.expand2(vec2(4.0, 6.0)), egui::Id::new(("ec-slider", uid)), Sense::click_and_drag()); app.auto.add(&format!("effectControls.prop.{uid}.slider"), tr, &prop.name); - if (sresp.dragged() || sresp.clicked()) + if (sresp.dragged_by(egui::PointerButton::Primary) || sresp.clicked()) && let Some(pt) = sresp.interact_pointer_pos() { let f = ((pt.x - tr.min.x) / tr.width()).clamp(0.0, 1.0) as f64; @@ -1643,7 +1643,7 @@ pub fn viewer_hook( ctx.set_cursor_icon(egui::CursorIcon::Move); resp.clone().on_hover_text(format!("{}: {}", crate::i18n::effects::group(&g.match_id, &g.name), pr.name)); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pos) = resp.interact_pointer_pos() && let Some(lp) = fw::comp_to_layer(&fm, map.to_comp(pos)) { diff --git a/crates/ui-egui/src/panels/flowchart.rs b/crates/ui-egui/src/panels/flowchart.rs index f59d3598..b06c757b 100644 --- a/crates/ui-egui/src/panels/flowchart.rs +++ b/crates/ui-egui/src/panels/flowchart.rs @@ -283,7 +283,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { let pos = layout(&g, o.vertical); let origin = body.min + vec2(24.0 + o.pan[0], 24.0 + o.pan[1]); let bg = ui.interact(body, egui::Id::new("flow-bg"), Sense::click_and_drag()); - if bg.dragged() { + if bg.dragged_by(egui::PointerButton::Primary) { let d = bg.drag_delta(); app.ui.flowchart.pan[0] += d.x; app.ui.flowchart.pan[1] += d.y; diff --git a/crates/ui-egui/src/panels/fx_editors.rs b/crates/ui-egui/src/panels/fx_editors.rs index 1ae74caa..18b61b55 100644 --- a/crates/ui-egui/src/panels/fx_editors.rs +++ b/crates/ui-egui/src/panels/fx_editors.rs @@ -353,7 +353,7 @@ fn huesat_curves( } }; ui.data_mut(|d| d.insert_temp(drag_id, i)); - } else if resp.dragged() + } else if resp.dragged_by(egui::PointerButton::Primary) && let (Some(i), Some(pt)) = (dragging, resp.interact_pointer_pos()) { let q = to_g(pt); @@ -523,7 +523,7 @@ fn colorama_wheel( d.insert_temp(drag_id, i); d.insert_temp(sel_id, i); }); - } else if resp.dragged() + } else if resp.dragged_by(egui::PointerButton::Primary) && let (Some(i), Some(q)) = (dragging, resp.interact_pointer_pos()) && i < pal.stops.len() { @@ -994,7 +994,7 @@ pub fn reshape_overlay( let hr = Rect::from_center_size(s, vec2(12.0, 12.0)); let id = egui::Id::new(("reshape-pt", g.uid, i, end)); let resp = ui.interact(hr, id, Sense::drag()); - let hot = resp.hovered() || resp.dragged(); + let hot = resp.hovered() || resp.dragged_by(egui::PointerButton::Primary); painter.rect_filled(Rect::from_center_size(s, vec2(7.0, 7.0)), 0.0, if hot { Color32::WHITE } else { col }); painter.rect_stroke(Rect::from_center_size(s, vec2(7.0, 7.0)), 0.0, Stroke::new(1.0, Color32::BLACK), StrokeKind::Outside); let which = if end == 0 { "source" } else { "dest" }; @@ -1002,7 +1002,7 @@ pub fn reshape_overlay( if hot { ctx.set_cursor_icon(egui::CursorIcon::Move); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pos) = resp.interact_pointer_pos() && let Some(lp) = fw::comp_to_layer(m, map.to_comp(pos)) { @@ -1088,7 +1088,7 @@ pub fn mesh_warp_overlay( let hr = Rect::from_center_size(*s, vec2(10.0, 10.0)); let id = egui::Id::new(("mesh-warp-vertex", g.uid, k)); let resp = ui.interact(hr, id, Sense::drag()); - let hot = resp.hovered() || resp.dragged(); + let hot = resp.hovered() || resp.dragged_by(egui::PointerButton::Primary); let dot = Rect::from_center_size(*s, vec2(5.0, 5.0)); painter.rect_filled(dot, 0.0, if hot { accent } else { Color32::WHITE }); painter.rect_stroke(dot, 0.0, Stroke::new(1.0, Color32::BLACK), StrokeKind::Outside); @@ -1097,7 +1097,7 @@ pub fn mesh_warp_overlay( if hot { ctx.set_cursor_icon(egui::CursorIcon::Move); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pos) = resp.interact_pointer_pos() && let Some(lp) = fw::comp_to_layer(fm, map.to_comp(pos)) { diff --git a/crates/ui-egui/src/panels/fx_widgets.rs b/crates/ui-egui/src/panels/fx_widgets.rs index ca49c3fd..7312dfae 100644 --- a/crates/ui-egui/src/panels/fx_widgets.rs +++ b/crates/ui-egui/src/panels/fx_widgets.rs @@ -109,7 +109,7 @@ pub fn angle_dial(ui: &mut egui::Ui, rect: Rect, value: f64, id: egui::Id, t: &T let (rev, _) = split_angle(value); out = Some(rev as f64 * 360.0 + now.rem_euclid(360.0)); } - } else if resp.dragged() { + } else if resp.dragged_by(egui::PointerButton::Primary) { let prev: f64 = ui.data(|d| d.get_temp(prev_id)).unwrap_or(now); let mut nv = value + wrap_delta(prev, now); if ui.input(|i| i.modifiers.shift) { @@ -377,7 +377,7 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u if resp.drag_started() { ui.data_mut(|d| d.insert_temp(pencil_id, (0..=64).map(|i| pts.eval(i as f32 / 64.0)).collect::>())); } - if (resp.dragged() || resp.clicked()) + if (resp.dragged_by(egui::PointerButton::Primary) || resp.clicked()) && let Some(pt) = resp.interact_pointer_pos() { let mut samples: Vec = ui.data(|d| d.get_temp(pencil_id)).unwrap_or_else(|| (0..=64).map(|i| pts.eval(i as f32 / 64.0)).collect()); @@ -407,7 +407,7 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u } }; ui.data_mut(|d| d.insert_temp(drag_id, i)); - } else if resp.dragged() + } else if resp.dragged_by(egui::PointerButton::Primary) && let (Some(i), Some(pt)) = (dragging, resp.interact_pointer_pos()) { let g = to_g(pt); @@ -532,9 +532,9 @@ pub fn level_handle(ui: &mut egui::Ui, track: Rect, value: f64, fill: Color32, i let x = track.min.x + track.width() * value.clamp(0.0, 1.0) as f32; let hr = Rect::from_center_size(pos2(x, track.min.y + 4.0), vec2(12.0, 12.0)); let resp = ui.interact(hr, id, Sense::drag()); - triangle_marker(ui.painter(), x, track.min.y, if resp.hovered() || resp.dragged() { t.accent } else { fill }, t); + triangle_marker(ui.painter(), x, track.min.y, if resp.hovered() || resp.dragged_by(egui::PointerButton::Primary) { t.accent } else { fill }, t); let mut out = None; - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pt) = resp.interact_pointer_pos() { out = Some((((pt.x - track.min.x) / track.width()) as f64).clamp(0.0, 1.0)); diff --git a/crates/ui-egui/src/panels/gradient_editor.rs b/crates/ui-egui/src/panels/gradient_editor.rs index bb692302..8bf4db26 100644 --- a/crates/ui-egui/src/panels/gradient_editor.rs +++ b/crates/ui-egui/src/panels/gradient_editor.rs @@ -332,7 +332,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) { if resp.clicked() || resp.drag_started() { app.dialog_state.gradient.selected = Some((track, id)); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(p) = resp.interact_pointer_pos() { app.dialog_state.gradient.move_to(track, id, pos_of(p.x)); diff --git a/crates/ui-egui/src/panels/gradient_handles.rs b/crates/ui-egui/src/panels/gradient_handles.rs index bfe87a47..7f763646 100644 --- a/crates/ui-egui/src/panels/gradient_handles.rs +++ b/crates/ui-egui/src/panels/gradient_handles.rs @@ -86,7 +86,7 @@ pub fn viewer_hook( ctx.set_cursor_icon(egui::CursorIcon::Move); resp.clone().on_hover_text(format!("{}: {}", g.name, pr.name)); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pos) = resp.interact_pointer_pos() && let Some(lp) = fw::comp_to_layer(&pm, map.to_comp(pos)) { diff --git a/crates/ui-egui/src/panels/graph.rs b/crates/ui-egui/src/panels/graph.rs index fc6d40e8..75f15d41 100644 --- a/crates/ui-egui/src/panels/graph.rs +++ b/crates/ui-egui/src/panels/graph.rs @@ -490,7 +490,7 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte { ctx.data_mut(|dd| dd.insert_temp(key_grab_id(), KeyGrab { press: o, t: k.t })); } - if kresp.dragged() + if kresp.dragged_by(egui::PointerButton::Primary) && let Some(pt) = kresp.interact_pointer_pos() && let Some(g) = ctx.data(|dd| dd.get_temp::(key_grab_id())) { @@ -520,7 +520,7 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte if bg.clicked() { actions.push(("keys.select".into(), json!({"keys": []}))); } - if bg.dragged() + if bg.dragged_by(egui::PointerButton::Primary) && let (Some(o), Some(cur)) = (ctx.input(|i| i.pointer.press_origin()), bg.interact_pointer_pos()) { let br = Rect::from_two_pos(o, cur); diff --git a/crates/ui-egui/src/panels/graph_tools.rs b/crates/ui-egui/src/panels/graph_tools.rs index a13a5396..8b6617cf 100644 --- a/crates/ui-egui/src/panels/graph_tools.rs +++ b/crates/ui-egui/src/panels/graph_tools.rs @@ -139,7 +139,7 @@ pub(crate) fn transform_box( if (st.handle == 8) == handles { return; } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pt) = resp.interact_pointer_pos() { let cur = data(pt); diff --git a/crates/ui-egui/src/panels/markers_ui.rs b/crates/ui-egui/src/panels/markers_ui.rs index 2fff7e1c..ef7455a6 100644 --- a/crates/ui-egui/src/panels/markers_ui.rs +++ b/crates/ui-egui/src/panels/markers_ui.rs @@ -320,7 +320,7 @@ fn marker(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, comp: if resp.drag_started() { ctx.data_mut(|d| d.insert_temp(drag_state_id(), (r.layer, r.index, mods.alt))); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pt) = resp.interact_pointer_pos() && let Some((layer, index, alt)) = ctx.data(|d| d.get_temp::<(Option, usize, bool)>(drag_state_id())) { @@ -403,7 +403,7 @@ pub(crate) fn marker_bin(app: &mut EffectcraftApp, ui: &mut egui::Ui, comp: &Com snapped.min(comp.duration.seconds()) }); let Some(at) = at else { return }; - if resp.dragged() { + if resp.dragged_by(egui::PointerButton::Primary) { let h = strip.height().min(10.0); let col = marker_color(&t, effectcraft_engine::color::Label::None); let p = ui.painter().with_clip_rect(strip); diff --git a/crates/ui-egui/src/panels/project.rs b/crates/ui-egui/src/panels/project.rs index 46187fa8..181796e0 100644 --- a/crates/ui-egui/src/panels/project.rs +++ b/crates/ui-egui/src/panels/project.rs @@ -1043,7 +1043,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { } let box_id = egui::Id::new("proj-marquee"); if let (Some(start), Some(end)) = (ctx.input(|i| i.pointer.press_origin()), empty.interact_pointer_pos()) - && empty.dragged() + && empty.dragged_by(egui::PointerButton::Primary) { let b = Rect::from_two_pos(start, end).intersect(list); lp.rect_filled(b, 0.0, t.accent.gamma_multiply(0.12)); diff --git a/crates/ui-egui/src/panels/roto_tool.rs b/crates/ui-egui/src/panels/roto_tool.rs index fbd7119c..450eac20 100644 --- a/crates/ui-egui/src/panels/roto_tool.rs +++ b/crates/ui-egui/src/panels/roto_tool.rs @@ -295,11 +295,11 @@ pub fn span_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, let handle: i32 = ui.ctx().data(|m| m.get_temp(hid)).unwrap_or(0); if let Some(pos) = resp.interact_pointer_pos() { let f = f_of(pos.x); - if handle == 0 && (resp.clicked() || resp.dragged()) { + if handle == 0 && (resp.clicked() || resp.dragged_by(egui::PointerButton::Primary)) { let t = layer.comp_time(comp.frame_rate.tick_of(f)); let _ = app.session.execute("time.set", json!({"time": t.seconds()})); } - if handle != 0 && resp.dragged() { + if handle != 0 && resp.dragged_by(egui::PointerButton::Primary) { p.line_segment([pos2(pos.x, track.min.y), pos2(pos.x, track.max.y)], Stroke::new(2.0, Color32::from_rgb(240, 200, 40))); } if handle != 0 && resp.drag_stopped() { diff --git a/crates/ui-egui/src/panels/scriptui_view.rs b/crates/ui-egui/src/panels/scriptui_view.rs index f0a3975f..751dbce3 100644 --- a/crates/ui-egui/src/panels/scriptui_view.rs +++ b/crates/ui-egui/src/panels/scriptui_view.rs @@ -186,7 +186,7 @@ fn draw_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, origin: egui::Pos2, }) .inner; let r = tip(r); - if r.dragged() { + if r.dragged_by(egui::PointerButton::Primary) { // Live: each step of the drag reaches the script (onChanging). if r.changed() { acts.push(Act::Changing(win, w.id, json!(v))); diff --git a/crates/ui-egui/src/panels/timeline.rs b/crates/ui-egui/src/panels/timeline.rs index 163e6507..5e86246c 100644 --- a/crates/ui-egui/src/panels/timeline.rs +++ b/crates/ui-egui/src/panels/timeline.rs @@ -1494,7 +1494,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { } app.auto.add("timeline.timecode", tc_rect, &tc); super::toggle_time_display(app, &tc_resp); - if tc_resp.dragged() { + if tc_resp.dragged_by(egui::PointerButton::Primary) { let d = tc_resp.drag_delta().x as f64; let f = fr.frame_at(time) + (d * 0.5).round() as i64; let _ = app.session.execute("time.set", json!({"frame": f.max(0)})); @@ -1564,7 +1564,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { // visible span (pulled in: zoomed in; stretched to the whole track: the whole comp). let nresp = ui.interact(nav, egui::Id::new("tl-nav"), Sense::drag()); app.auto.add("timeline.navigator", nav, "Time navigator"); - if nresp.dragged() { + if nresp.dragged_by(egui::PointerButton::Primary) { let d = nresp.drag_delta().x as f64 / nav.width() as f64 * comp.duration.seconds(); app.ui.timeline.start = (app.ui.timeline.start + d).clamp(0.0, comp.duration.seconds()); if app.ui.timeline.pps.is_none() { @@ -1613,7 +1613,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { if bresp.drag_started() { ctx.data_mut(|d| d.insert_temp(bar_start, wa0)); } - if bresp.dragged() + if bresp.dragged_by(egui::PointerButton::Primary) && let (Some(a0), Some(d)) = (ctx.data(|d| d.get_temp::(bar_start)), bresp.total_drag_delta()) { let len = wa1 - wa0; @@ -1634,7 +1634,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { p.rect_filled(handle, 2.0, t.accent); let resp = ui.interact(hr, egui::Id::new(("wa", set)), Sense::drag()); app.auto.add(&format!("timeline.workArea.{set}"), hr, set); - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(pt) = resp.interact_pointer_pos() { let mut secs = tm.t(pt.x).max(0.0); @@ -1734,7 +1734,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { // Zoomed in, a scrub held past either end of the ruler scrolls the timeline that way // (faster the further), with the CTI at the edge (After Effects). let mut tm = tm; - if rresp.dragged() && app.ui.timeline.pps.is_some() { + if rresp.dragged_by(egui::PointerButton::Primary) && app.ui.timeline.pps.is_some() { let speed = edge_scroll_speed_x(tm.x0, graph_x1, x); if speed != 0.0 { let dt = f64::from(ui.input(|i| i.stable_dt).clamp(0.0, 0.1)); @@ -1768,7 +1768,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { } } // Ctrl/Cmd-drag scrubs the audio too (After Effects). - if rresp.dragged() + if rresp.dragged_by(egui::PointerButton::Primary) && ui.input(|i| i.modifiers.command) && let Some(cid) = app.session.active_comp_id() { @@ -2987,7 +2987,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { actions.push(("layer.select".into(), json!({"layers": []}))); } if let (Some(start), Some(end)) = (ctx.input(|i| i.pointer.press_origin()), outline_empty.interact_pointer_pos()) - && outline_empty.dragged() + && outline_empty.dragged_by(egui::PointerButton::Primary) { let box_rect = Rect::from_two_pos(start, end).intersect(outline_rect); lp.rect_filled(box_rect, 0.0, t.accent.gamma_multiply(0.12)); @@ -3080,7 +3080,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { actions.push(("layer.select".into(), json!({"layers": []}))); } if let (true, Some(origin), Some(cur)) = - (empty.dragged(), empty.interact_pointer_pos().and_then(|_| ctx.input(|i| i.pointer.press_origin())), empty.interact_pointer_pos()) + (empty.dragged_by(egui::PointerButton::Primary), empty.interact_pointer_pos().and_then(|_| ctx.input(|i| i.pointer.press_origin())), empty.interact_pointer_pos()) { let br = Rect::from_two_pos(origin, cur); gp.rect_filled(br, 0.0, t.accent.gamma_multiply(0.12)); diff --git a/crates/ui-egui/src/panels/viewer.rs b/crates/ui-egui/src/panels/viewer.rs index f4bb5a88..b11f5fc5 100644 --- a/crates/ui-egui/src/panels/viewer.rs +++ b/crates/ui-egui/src/panels/viewer.rs @@ -1363,7 +1363,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) { } else { app.pointer_comp = None; } - app.ui.viewer.interacting = resp.dragged(); + app.ui.viewer.interacting = resp.dragged_by(egui::PointerButton::Primary); let mods = ui.input(|i| i.modifiers); let space_pan = super::space_hand(&ctx); // Pen tool: each press places a vertex (dragging pulls Bezier tangents); pressing on the diff --git a/crates/ui-egui/src/panels/viewer_tools.rs b/crates/ui-egui/src/panels/viewer_tools.rs index d229f272..580db7f2 100644 --- a/crates/ui-egui/src/panels/viewer_tools.rs +++ b/crates/ui-egui/src/panels/viewer_tools.rs @@ -230,7 +230,7 @@ pub(crate) fn rulers(app: &mut EffectcraftApp, ui: &mut egui::Ui, map: &ViewerMa .on_hover_text(crate::i18n::tr("Ruler zero point (drag to move, double-click to reset)")); app.auto.add("viewer.ruler.origin", corner, "Ruler zero point"); let fg = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("vw-ruler-fg"))); - if cr.dragged() + if cr.dragged_by(egui::PointerButton::Primary) && let Some(hp) = cr.interact_pointer_pos() { fg.line_segment([pos2(inner.min.x, hp.y), pos2(inner.max.x, hp.y)], Stroke::new(1.0, t.accent)); @@ -253,7 +253,7 @@ pub(crate) fn rulers(app: &mut EffectcraftApp, ui: &mut egui::Ui, map: &ViewerMa if resp.hovered() { ui.ctx().set_cursor_icon(if vertical { egui::CursorIcon::ResizeHorizontal } else { egui::CursorIcon::ResizeVertical }); } - if resp.dragged() + if resp.dragged_by(egui::PointerButton::Primary) && let Some(hp) = resp.interact_pointer_pos() { let s = Stroke::new(1.0, guide_color(app));