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

Fix wrong pixels-per-point for wgpu

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-07 18:42:04 +01:00
parent d3134871d2
commit 25fd7ba2be
4 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,10 +787,11 @@ mod glow_integration {
let native_pixels_per_point = window.scale_factor() as f32; let native_pixels_per_point = window.scale_factor() as f32;
if win.egui_winit.is_none() { if win.egui_winit.is_none() {
let mut egui_winit = egui_winit::State::new(event_loop); win.egui_winit = Some(egui_winit::State::new(
egui_winit.set_max_texture_side(self.max_texture_side); event_loop,
egui_winit.set_pixels_per_point(native_pixels_per_point); Some(native_pixels_per_point),
win.egui_winit = Some(egui_winit); Some(self.max_texture_side),
));
} }
win.gl_surface = Some(gl_surface); win.gl_surface = Some(gl_surface);
@@ -1898,7 +1899,7 @@ mod wgpu_integration {
pub struct Viewport { pub struct Viewport {
window: Option<Rc<RefCell<winit::window::Window>>>, window: Option<Rc<RefCell<winit::window::Window>>>,
state: Rc<RefCell<Option<egui_winit::State>>>, egui_winit: Rc<RefCell<Option<egui_winit::State>>>,
/// `None` for sync viewports. /// `None` for sync viewports.
viewport_ui_cb: Option<Arc<Box<ViewportUiCallback>>>, viewport_ui_cb: Option<Arc<Box<ViewportUiCallback>>>,
@@ -2001,9 +2002,9 @@ mod wgpu_integration {
}; };
let viewport_builders = running.builders.borrow(); let viewport_builders = running.builders.borrow();
for (id, Viewport { window, state, .. }) in running.viewports.borrow_mut().iter_mut() { for (id, viewport) in running.viewports.borrow_mut().iter_mut() {
let builder = viewport_builders.get(id).unwrap(); let builder = viewport_builders.get(id).unwrap();
if window.is_some() { if viewport.window.is_some() {
continue; continue;
} }
@@ -2012,8 +2013,8 @@ mod wgpu_integration {
builder, builder,
&mut running.viewport_maps.borrow_mut(), &mut running.viewport_maps.borrow_mut(),
&mut running.painter.borrow_mut(), &mut running.painter.borrow_mut(),
window, &mut viewport.window,
&mut state.borrow_mut(), &mut viewport.egui_winit.borrow_mut(),
event_loop, event_loop,
); );
} }
@@ -2025,7 +2026,7 @@ mod wgpu_integration {
windows_id: &mut HashMap<winit::window::WindowId, ViewportId>, windows_id: &mut HashMap<winit::window::WindowId, ViewportId>,
painter: &mut egui_wgpu::winit::Painter, painter: &mut egui_wgpu::winit::Painter,
window: &mut Option<Rc<RefCell<winit::window::Window>>>, window: &mut Option<Rc<RefCell<winit::window::Window>>>,
state: &mut Option<egui_winit::State>, egui_winit: &mut Option<egui_winit::State>,
event_loop: &EventLoopWindowTarget<UserEvent>, event_loop: &EventLoopWindowTarget<UserEvent>,
) { ) {
if let Ok(new_window) = create_winit_window_builder(builder).build(event_loop) { if let Ok(new_window) = create_winit_window_builder(builder).build(event_loop) {
@@ -2034,8 +2035,14 @@ mod wgpu_integration {
if let Err(err) = pollster::block_on(painter.set_window(id, Some(&new_window))) { if let Err(err) = pollster::block_on(painter.set_window(id, Some(&new_window))) {
log::error!("on set_window: viewport_id {id:?} {err}"); log::error!("on set_window: viewport_id {id:?} {err}");
} }
*egui_winit = Some(egui_winit::State::new(
event_loop,
Some(new_window.scale_factor() as f32),
painter.max_texture_side(),
));
*window = Some(Rc::new(RefCell::new(new_window))); *window = Some(Rc::new(RefCell::new(new_window)));
*state = Some(egui_winit::State::new(event_loop));
} }
} }
@@ -2133,11 +2140,16 @@ mod wgpu_integration {
}); });
} }
let mut state = egui_winit::State::new(event_loop); let mut egui_winit = egui_winit::State::new(
event_loop,
Some(window.scale_factor() as f32),
painter.max_texture_side(),
);
#[cfg(feature = "accesskit")] #[cfg(feature = "accesskit")]
{ {
let event_loop_proxy = self.repaint_proxy.lock().clone(); let event_loop_proxy = self.repaint_proxy.lock().clone();
integration.init_accesskit(&mut state, &window, event_loop_proxy); integration.init_accesskit(&mut egui_winit, &window, event_loop_proxy);
} }
let theme = system_theme.unwrap_or(self.native_options.default_theme); let theme = system_theme.unwrap_or(self.native_options.default_theme);
integration.egui_ctx.set_visuals(theme.egui_visuals()); integration.egui_ctx.set_visuals(theme.egui_visuals());
@@ -2160,7 +2172,7 @@ mod wgpu_integration {
}; };
if app.warm_up_enabled() { if app.warm_up_enabled() {
integration.warm_up(app.as_mut(), &window, &mut state); integration.warm_up(app.as_mut(), &window, &mut egui_winit);
} }
let mut viewport_maps = HashMap::default(); let mut viewport_maps = HashMap::default();
@@ -2172,7 +2184,7 @@ mod wgpu_integration {
ViewportId::ROOT, ViewportId::ROOT,
Viewport { Viewport {
window: Some(Rc::new(RefCell::new(window))), window: Some(Rc::new(RefCell::new(window))),
state: Rc::new(RefCell::new(Some(state))), egui_winit: Rc::new(RefCell::new(Some(egui_winit))),
viewport_ui_cb: None, viewport_ui_cb: None,
parent_id: ViewportId::ROOT, parent_id: ViewportId::ROOT,
}, },
@@ -2263,13 +2275,16 @@ mod wgpu_integration {
let mut viewports = viewports.borrow_mut(); let mut viewports = viewports.borrow_mut();
let Viewport { window, state, .. } = let Viewport {
viewports.entry(id_pair.this).or_insert(Viewport { window,
window: None, egui_winit: state,
state: Rc::new(RefCell::new(None)), ..
viewport_ui_cb: None, } = viewports.entry(id_pair.this).or_insert(Viewport {
parent_id: id_pair.parent, window: None,
}); egui_winit: Rc::new(RefCell::new(None)),
viewport_ui_cb: None,
parent_id: id_pair.parent,
});
builders builders
.entry(id_pair.this) .entry(id_pair.this)
.or_insert(viewport_builder.clone()); .or_insert(viewport_builder.clone());
@@ -2295,7 +2310,7 @@ mod wgpu_integration {
// Render sync viewport: // Render sync viewport:
let viewport = viewports.borrow().get(&id_pair.this).cloned(); let viewport = viewports.borrow().get(&id_pair.this).cloned();
let Some(viewport) = viewport else { return }; let Some(viewport) = viewport else { return };
let Some(winit_state) = &mut *viewport.state.borrow_mut() else { let Some(winit_state) = &mut *viewport.egui_winit.borrow_mut() else {
return; return;
}; };
let Some(window) = viewport.window else { let Some(window) = viewport.window else {
@@ -2431,7 +2446,7 @@ mod wgpu_integration {
viewport_id, viewport_id,
Viewport { Viewport {
window: Some(window), window: Some(window),
state, egui_winit: state,
viewport_ui_cb, viewport_ui_cb,
parent_id, parent_id,
}, },
@@ -2553,7 +2568,7 @@ mod wgpu_integration {
if recreate { if recreate {
if let Some(viewport) = viewports.get_mut(&id_pair.this) { if let Some(viewport) = viewports.get_mut(&id_pair.this) {
viewport.window = None; viewport.window = None;
viewport.state.replace(None); viewport.egui_winit.replace(None);
} }
} else if let Some(Viewport { } else if let Some(Viewport {
window: Some(window), window: Some(window),
@@ -2572,7 +2587,7 @@ mod wgpu_integration {
id_pair.this, id_pair.this,
Viewport { Viewport {
window: None, window: None,
state: Rc::new(RefCell::new(None)), egui_winit: Rc::new(RefCell::new(None)),
viewport_ui_cb, viewport_ui_cb,
parent_id: id_pair.parent, parent_id: id_pair.parent,
}, },
@@ -2768,11 +2783,11 @@ mod wgpu_integration {
_ => {} _ => {}
}; };
let event_response = if let Some((id, Viewport { state, .. })) = viewport_id let event_response = if let Some((id, viewport)) =
.and_then(|id| { viewport_id.and_then(|id| {
running.viewports.borrow().get(&id).map(|w| (id, w.clone())) running.viewports.borrow().get(&id).map(|w| (id, w.clone()))
}) { }) {
if let Some(state) = &mut *state.borrow_mut() { if let Some(state) = &mut *viewport.egui_winit.borrow_mut() {
Some(running.integration.borrow_mut().on_event( Some(running.integration.borrow_mut().on_event(
running.app.as_mut(), running.app.as_mut(),
event, event,
@@ -2810,13 +2825,13 @@ mod wgpu_integration {
accesskit_winit::ActionRequestEvent { request, window_id }, accesskit_winit::ActionRequestEvent { request, window_id },
)) => { )) => {
if let Some(running) = &mut self.running { if let Some(running) = &mut self.running {
if let Some(Viewport { state, .. }) = running if let Some(viewport) = running
.viewport_maps .viewport_maps
.borrow() .borrow()
.get(window_id) .get(window_id)
.and_then(|id| running.viewports.borrow().get(id).cloned()) .and_then(|id| running.viewports.borrow().get(id).cloned())
{ {
if let Some(state) = &mut *state.borrow_mut() { if let Some(state) = &mut *viewport.egui_winit.borrow_mut() {
state.on_accesskit_action_request(request.clone()); state.on_accesskit_action_request(request.clone());
} }
} }

15
crates/egui-winit/src/lib.rs
View File

@@ -87,13 +87,17 @@ pub struct State {
impl State { impl State {
/// Construct a new instance /// Construct a new instance
pub fn new(display_target: &dyn HasRawDisplayHandle) -> Self { pub fn new(
display_target: &dyn HasRawDisplayHandle,
native_pixels_per_point: Option<f32>,
max_texture_side: Option<usize>,
) -> Self {
let egui_input = egui::RawInput { let egui_input = egui::RawInput {
focused: false, // winit will tell us when we have focus focused: false, // winit will tell us when we have focus
..Default::default() ..Default::default()
}; };
Self { let mut slf = Self {
start_time: web_time::Instant::now(), start_time: web_time::Instant::now(),
egui_input, egui_input,
pointer_pos_in_points: None, pointer_pos_in_points: None,
@@ -112,7 +116,14 @@ impl State {
accesskit: None, accesskit: None,
allow_ime: false, allow_ime: false,
};
if let Some(native_pixels_per_point) = native_pixels_per_point {
slf.set_pixels_per_point(native_pixels_per_point);
} }
if let Some(max_texture_side) = max_texture_side {
slf.set_max_texture_side(max_texture_side);
}
slf
} }
#[cfg(feature = "accesskit")] #[cfg(feature = "accesskit")]

2
crates/egui_glow/examples/pure_glow.rs
View File

@@ -154,7 +154,7 @@ fn main() {
let (gl_window, gl) = create_display(&event_loop); let (gl_window, gl) = create_display(&event_loop);
let gl = std::sync::Arc::new(gl); let gl = std::sync::Arc::new(gl);
let mut egui_glow = egui_glow::EguiGlow::new(&event_loop, gl.clone(), None); let mut egui_glow = egui_glow::EguiGlow::new(&event_loop, gl.clone(), None, None);
let event_loop_proxy = egui::mutex::Mutex::new(event_loop.create_proxy()); let event_loop_proxy = egui::mutex::Mutex::new(event_loop.create_proxy());
egui_glow egui_glow

7
crates/egui_glow/src/winit.rs
View File

@@ -20,6 +20,7 @@ impl EguiGlow {
event_loop: &winit::event_loop::EventLoopWindowTarget<E>, event_loop: &winit::event_loop::EventLoopWindowTarget<E>,
gl: std::sync::Arc<glow::Context>, gl: std::sync::Arc<glow::Context>,
shader_version: Option<ShaderVersion>, shader_version: Option<ShaderVersion>,
native_pixels_per_point: Option<f32>,
) -> Self { ) -> Self {
let painter = crate::Painter::new(gl, "", shader_version) let painter = crate::Painter::new(gl, "", shader_version)
.map_err(|err| { .map_err(|err| {
@@ -29,7 +30,11 @@ impl EguiGlow {
Self { Self {
egui_ctx: Default::default(), egui_ctx: Default::default(),
egui_winit: egui_winit::State::new(event_loop), egui_winit: egui_winit::State::new(
event_loop,
native_pixels_per_point,
Some(painter.max_texture_side()),
),
painter, painter,
shapes: Default::default(), shapes: Default::default(),
textures_delta: Default::default(), textures_delta: Default::default(),