migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Introduce ViewportInfo

Browse Source
This commit is contained in:
Konkitoman
2023-11-08 07:29:00 +02:00
parent 0d7c87836c
commit 12f3782721
12 changed files with 102 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/eframe/src/native/epi_integration.rs
View File

@@ -492,11 +492,11 @@ impl EpiIntegration {
self.frame.info.window_info =
read_window_info(window, self.egui_ctx.pixels_per_point(), &self.window_state);
let mut raw_input = egui_winit.take_egui_input(window);
let mut raw_input = egui_winit.take_egui_input(window, id_pair);
raw_input.time = Some(self.beginning.elapsed().as_secs_f64());
// Run user code:
let full_output = self.egui_ctx.run(raw_input, id_pair, |egui_ctx| {
let full_output = self.egui_ctx.run(raw_input, |egui_ctx| {
crate::profile_scope!("App::update");
if let Some(viewport_ui_cb) = viewport_ui_cb {
// Child viewport

8
crates/eframe/src/native/run.rs
View File

@@ -1196,9 +1196,9 @@ mod glow_integration {
return;
};
let win = win.borrow();
let mut input = winit_state.take_egui_input(&win);
let mut input = winit_state.take_egui_input(&win, id_pair);
input.time = Some(beginning.elapsed().as_secs_f64());
let output = egui_ctx.run(input, id_pair, |ctx| {
let output = egui_ctx.run(input, |ctx| {
viewport_ui_cb(ctx);
});
@@ -2323,9 +2323,9 @@ mod wgpu_integration {
return;
};
let win = window.borrow();
let mut input = winit_state.take_egui_input(&win);
let mut input = winit_state.take_egui_input(&win, id_pair);
input.time = Some(beginning.elapsed().as_secs_f64());
let output = egui_ctx.run(input, id_pair, |ctx| {
let output = egui_ctx.run(input, |ctx| {
viewport_ui_cb(ctx);
});