migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Revert unrelated changes

Browse Source
This commit is contained in:
lucasmerlin
2025-10-12 19:46:32 +02:00
parent d92b204691
commit 73a8b316de
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/eframe/src/web/events.rs
View File

@@ -682,7 +682,6 @@ fn install_touchstart(runner_ref: &WebRunner, target: &EventTarget) -> Result<()
|event: web_sys::TouchEvent, runner| { |event: web_sys::TouchEvent, runner| {
let mut should_stop_propagation = true; let mut should_stop_propagation = true;
let mut should_prevent_default = true; let mut should_prevent_default = true;
push_touches(runner, egui::TouchPhase::Start, &event);
if let Some((pos, _)) = primary_touch_pos(runner, &event) { if let Some((pos, _)) = primary_touch_pos(runner, &event) {
let egui_event = egui::Event::PointerButton { let egui_event = egui::Event::PointerButton {
pos, pos,
@@ -692,9 +691,10 @@ fn install_touchstart(runner_ref: &WebRunner, target: &EventTarget) -> Result<()
}; };
should_stop_propagation = (runner.web_options.should_stop_propagation)(&egui_event); should_stop_propagation = (runner.web_options.should_stop_propagation)(&egui_event);
should_prevent_default = (runner.web_options.should_prevent_default)(&egui_event); should_prevent_default = (runner.web_options.should_prevent_default)(&egui_event);
// runner.input.raw.events.push(egui_event); runner.input.raw.events.push(egui_event);
} }
push_touches(runner, egui::TouchPhase::Start, &event);
runner.needs_repaint.repaint_asap(); runner.needs_repaint.repaint_asap();
// Use web options to tell if the web event should be propagated to parent elements based on the egui event. // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
@@ -721,7 +721,7 @@ fn install_touchmove(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
(runner.web_options.should_stop_propagation)(&egui_event); (runner.web_options.should_stop_propagation)(&egui_event);
let should_prevent_default = let should_prevent_default =
(runner.web_options.should_prevent_default)(&egui_event); (runner.web_options.should_prevent_default)(&egui_event);
// runner.input.raw.events.push(egui_event); runner.input.raw.events.push(egui_event);
push_touches(runner, egui::TouchPhase::Move, &event); push_touches(runner, egui::TouchPhase::Move, &event);
runner.needs_repaint.repaint(); runner.needs_repaint.repaint();
@@ -746,7 +746,6 @@ fn install_touchend(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
runner, runner,
egui::pos2(touch.client_x() as f32, touch.client_y() as f32), egui::pos2(touch.client_x() as f32, touch.client_y() as f32),
) { ) {
push_touches(runner, egui::TouchPhase::End, &event);
// First release mouse to click: // First release mouse to click:
let mut should_stop_propagation = true; let mut should_stop_propagation = true;
let mut should_prevent_default = true; let mut should_prevent_default = true;
@@ -759,14 +758,15 @@ fn install_touchend(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
should_stop_propagation &= should_stop_propagation &=
(runner.web_options.should_stop_propagation)(&egui_event); (runner.web_options.should_stop_propagation)(&egui_event);
should_prevent_default &= (runner.web_options.should_prevent_default)(&egui_event); should_prevent_default &= (runner.web_options.should_prevent_default)(&egui_event);
// runner.input.raw.events.push(egui_event); runner.input.raw.events.push(egui_event);
// Then remove hover effect: // Then remove hover effect:
should_stop_propagation &= should_stop_propagation &=
(runner.web_options.should_stop_propagation)(&egui::Event::PointerGone); (runner.web_options.should_stop_propagation)(&egui::Event::PointerGone);
should_prevent_default &= should_prevent_default &=
(runner.web_options.should_prevent_default)(&egui::Event::PointerGone); (runner.web_options.should_prevent_default)(&egui::Event::PointerGone);
// runner.input.raw.events.push(egui::Event::PointerGone); runner.input.raw.events.push(egui::Event::PointerGone);
push_touches(runner, egui::TouchPhase::End, &event);
runner.needs_repaint.repaint_asap(); runner.needs_repaint.repaint_asap();

1
crates/egui_demo_app/src/wrap_app.rs
View File

@@ -5,7 +5,6 @@ use eframe::glow;
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use core::any::Any; use core::any::Any;
use log::info;
#[derive(Default)] #[derive(Default)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]