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

Add Context::set_pixels_per_point to control the scale of the UI

Browse Source
This commit is contained in:
Emil Ernerfeldt
2021-02-21 11:23:33 +01:00
parent c601db5956
commit 5f6a468812
9 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
egui_glium/src/backend.rs
View File

@@ -192,11 +192,16 @@ pub fn run(mut app: Box<dyn epi::App>) -> ! {
event_loop.run(move |event, _, control_flow| {
let mut redraw = || {
let pixels_per_point = input_state
.raw
.pixels_per_point
.unwrap_or_else(|| ctx.pixels_per_point());
let frame_start = Instant::now();
input_state.raw.time = Some(start_time.elapsed().as_nanos() as f64 * 1e-9);
input_state.raw.screen_rect = Some(Rect::from_min_size(
Default::default(),
screen_size_in_pixels(&display) / input_state.raw.pixels_per_point.unwrap(),
screen_size_in_pixels(&display) / pixels_per_point,
));
ctx.begin_frame(input_state.raw.take());
@@ -225,16 +230,7 @@ pub fn run(mut app: Box<dyn epi::App>) -> ! {
);
{
let epi::backend::AppOutput {
quit,
window_size,
pixels_per_point,
} = app_output;
if let Some(pixels_per_point) = pixels_per_point {
// User changed GUI scale
input_state.raw.pixels_per_point = Some(pixels_per_point);
}
let epi::backend::AppOutput { quit, window_size } = app_output;
if let Some(window_size) = window_size {
display.gl_window().window().set_inner_size(
@@ -283,7 +279,13 @@ pub fn run(mut app: Box<dyn epi::App>) -> ! {
glutin::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
glutin::event::Event::WindowEvent { event, .. } => {
input_to_egui(event, clipboard.as_mut(), &mut input_state, control_flow);
input_to_egui(
ctx.pixels_per_point(),
event,
clipboard.as_mut(),
&mut input_state,
control_flow,
);
display.gl_window().window().request_redraw(); // TODO: ask egui if the events warrants a repaint instead
}
glutin::event::Event::LoopDestroyed => {

8
egui_glium/src/lib.rs
View File

@@ -46,6 +46,7 @@ impl GliumInputState {
}
pub fn input_to_egui(
pixels_per_point: f32,
event: glutin::event::WindowEvent<'_>,
clipboard: Option<&mut ClipboardContext>,
input_state: &mut GliumInputState,
@@ -54,6 +55,9 @@ pub fn input_to_egui(
use glutin::event::WindowEvent;
match event {
WindowEvent::CloseRequested | WindowEvent::Destroyed => *control_flow = ControlFlow::Exit,
WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
input_state.raw.pixels_per_point = Some(scale_factor as f32);
}
WindowEvent::MouseInput { state, button, .. } => {
if let Some(pos_in_points) = input_state.pointer_pos_in_points {
if let Some(button) = translate_mouse_button(button) {
@@ -71,8 +75,8 @@ pub fn input_to_egui(
..
} => {
let pos_in_points = pos2(
pos_in_pixels.x as f32 / input_state.raw.pixels_per_point.unwrap(),
pos_in_pixels.y as f32 / input_state.raw.pixels_per_point.unwrap(),
pos_in_pixels.x as f32 / pixels_per_point,
pos_in_pixels.y as f32 / pixels_per_point,
);
input_state.pointer_pos_in_points = Some(pos_in_points);
input_state