djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[egui_glium] minor code cleanup

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-17 02:31:37 +01:00
parent 421e8bc91e
commit d0fc77fe9b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
egui_glium/src/lib.rs
View file

@ -49,13 +49,13 @@ pub fn input_to_egui(
input_state: &mut GliumInputState, input_state: &mut GliumInputState,
control_flow: &mut ControlFlow, control_flow: &mut ControlFlow,
) { ) {
use glutin::event::WindowEvent::*; use glutin::event::WindowEvent;
match event { match event {
CloseRequested | Destroyed => *control_flow = ControlFlow::Exit, WindowEvent::CloseRequested | WindowEvent::Destroyed => *control_flow = ControlFlow::Exit,
MouseInput { state, .. } => { WindowEvent::MouseInput { state, .. } => {
input_state.raw.mouse_down = state == glutin::event::ElementState::Pressed; input_state.raw.mouse_down = state == glutin::event::ElementState::Pressed;
} }
CursorMoved { WindowEvent::CursorMoved {
position: pos_in_pixels, position: pos_in_pixels,
.. ..
} => { } => {
@ -64,10 +64,10 @@ pub fn input_to_egui(
pos_in_pixels.y as f32 / input_state.raw.pixels_per_point.unwrap(), pos_in_pixels.y as f32 / input_state.raw.pixels_per_point.unwrap(),
)); ));
} }
CursorLeft { .. } => { WindowEvent::CursorLeft { .. } => {
input_state.raw.mouse_pos = None; input_state.raw.mouse_pos = None;
} }
ReceivedCharacter(ch) => { WindowEvent::ReceivedCharacter(ch) => {
if printable_char(ch) if printable_char(ch)
&& !input_state.raw.modifiers.ctrl && !input_state.raw.modifiers.ctrl
&& !input_state.raw.modifiers.mac_cmd && !input_state.raw.modifiers.mac_cmd
@ -75,7 +75,7 @@ pub fn input_to_egui(
input_state.raw.events.push(Event::Text(ch.to_string())); input_state.raw.events.push(Event::Text(ch.to_string()));
} }
} }
KeyboardInput { input, .. } => { WindowEvent::KeyboardInput { input, .. } => {
if let Some(keycode) = input.virtual_keycode { if let Some(keycode) = input.virtual_keycode {
let pressed = input.state == glutin::event::ElementState::Pressed; let pressed = input.state == glutin::event::ElementState::Pressed;
@ -135,7 +135,7 @@ pub fn input_to_egui(
} }
} }
} }
MouseWheel { delta, .. } => { WindowEvent::MouseWheel { delta, .. } => {
match delta { match delta {
glutin::event::MouseScrollDelta::LineDelta(x, y) => { glutin::event::MouseScrollDelta::LineDelta(x, y) => {
let line_height = 24.0; // TODO let line_height = 24.0; // TODO