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

Only repaint on cursor movements of area, or if dragging outside (#4730)

Browse Source 
* Closes https://github.com/emilk/egui/issues/4723

Also fix some small bugs in the touch input on web
This commit is contained in:
Emil Ernerfeldt
2024-06-28 17:40:48 +02:00
committed by GitHub
parent 10f092d9d4
commit 0c059ac113
7 changed files with 142 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/egui/src/context.rs
View File

@@ -2026,8 +2026,10 @@ impl ContextImpl {
viewport.widgets_this_frame.clear();
}
if repaint_needed || viewport.input.wants_repaint() {
if repaint_needed {
self.request_repaint(ended_viewport_id, RepaintCause::new());
} else if let Some(delay) = viewport.input.wants_repaint_after() {
self.request_repaint_after(delay, ended_viewport_id, RepaintCause::new());
}
// -------------------

32
crates/egui/src/input_state.rs
View File

@@ -2,7 +2,10 @@ mod touch_state;
use crate::data::input::*;
use crate::{emath::*, util::History};
use std::collections::{BTreeMap, HashSet};
use std::{
collections::{BTreeMap, HashSet},
time::Duration,
};
pub use crate::Key;
pub use touch_state::MultiTouchInfo;
@@ -389,15 +392,30 @@ impl InputState {
}
/// The [`crate::Context`] will call this at the end of each frame to see if we need a repaint.
pub fn wants_repaint(&self) -> bool {
self.pointer.wants_repaint()
///
/// Returns how long to wait for a repaint.
pub fn wants_repaint_after(&self) -> Option<Duration> {
if self.pointer.wants_repaint()
|| self.unprocessed_scroll_delta.abs().max_elem() > 0.2
|| self.unprocessed_scroll_delta_for_zoom.abs() > 0.2
|| !self.events.is_empty()
{
// Immediate repaint
return Some(Duration::ZERO);
}
// We need to wake up and check for press-and-hold for the context menu.
// TODO(emilk): wake up after `MAX_CLICK_DURATION` instead of every frame.
|| (self.any_touches() && !self.pointer.is_decidedly_dragging())
if self.any_touches() && !self.pointer.is_decidedly_dragging() {
// We need to wake up and check for press-and-hold for the context menu.
if let Some(press_start_time) = self.pointer.press_start_time {
let press_duration = self.time - press_start_time;
if press_duration < MAX_CLICK_DURATION {
let secs_until_menu = MAX_CLICK_DURATION - press_duration;
return Some(Duration::from_secs_f64(secs_until_menu));
}
}
}
None
}
/// Count presses of a key. If non-zero, the presses are consumed, so that this will only return non-zero once.
@@ -1208,7 +1226,7 @@ impl InputState {
ui.collapsing("Raw Input", |ui| raw.ui(ui));
crate::containers::CollapsingHeader::new("🖱 Pointer")
.default_open(true)
.default_open(false)
.show(ui, |ui| {
pointer.ui(ui);
});