From 5528eef52dfc4cc942764369b7de4f9726868458 Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 21 Jan 2023 20:10:19 +0100 Subject: [PATCH] cargo fmt --- .../examples/basic.rs | 54 +++++++++++++------ .../src/lib.rs | 8 ++- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/imgui-winit-glow-renderer-viewports/examples/basic.rs b/imgui-winit-glow-renderer-viewports/examples/basic.rs index 11dfd99..b49e70f 100644 --- a/imgui-winit-glow-renderer-viewports/examples/basic.rs +++ b/imgui-winit-glow-renderer-viewports/examples/basic.rs @@ -5,14 +5,16 @@ use glutin::{ config::ConfigTemplateBuilder, context::ContextAttributesBuilder, display::GetGlDisplay, - prelude::{GlDisplay, NotCurrentGlContextSurfaceAccessor, PossiblyCurrentContextGlSurfaceAccessor}, - surface::{SurfaceAttributesBuilder, WindowSurface, GlSurface}, + prelude::{ + GlDisplay, NotCurrentGlContextSurfaceAccessor, PossiblyCurrentContextGlSurfaceAccessor, + }, + surface::{GlSurface, SurfaceAttributesBuilder, WindowSurface}, }; use glutin_winit::DisplayBuilder; use imgui::ConfigFlags; use imgui_winit_glow_renderer_viewports::Renderer; use raw_window_handle::HasRawWindowHandle; -use winit::{dpi::LogicalSize, event_loop::EventLoop, window::WindowBuilder, event::WindowEvent}; +use winit::{dpi::LogicalSize, event::WindowEvent, event_loop::EventLoop, window::WindowBuilder}; fn main() { let event_loop = EventLoop::new(); @@ -90,16 +92,26 @@ fn main() { let now = Instant::now(); imgui.io_mut().update_delta_time(now - last_frame); last_frame = now; - }, - winit::event::Event::WindowEvent { window_id, event: WindowEvent::CloseRequested } if window_id == window.id() => { + } + winit::event::Event::WindowEvent { + window_id, + event: WindowEvent::CloseRequested, + } if window_id == window.id() => { control_flow.set_exit(); - }, - winit::event::Event::WindowEvent { window_id, event: WindowEvent::Resized(new_size) } if window_id == window.id() => { - surface.resize(&context, NonZeroU32::new(new_size.width).unwrap(), NonZeroU32::new(new_size.height).unwrap()); - }, + } + winit::event::Event::WindowEvent { + window_id, + event: WindowEvent::Resized(new_size), + } if window_id == window.id() => { + surface.resize( + &context, + NonZeroU32::new(new_size.width).unwrap(), + NonZeroU32::new(new_size.height).unwrap(), + ); + } winit::event::Event::MainEventsCleared => { window.request_redraw(); - }, + } winit::event::Event::RedrawRequested(_) => { let ui = imgui.frame(); @@ -115,7 +127,9 @@ fn main() { renderer.prepare_render(&mut imgui, &window); imgui.update_platform_windows(); - renderer.update_viewports(&mut imgui, window_target, &glow).expect("Failed to update viewports"); + renderer + .update_viewports(&mut imgui, window_target, &glow) + .expect("Failed to update viewports"); let draw_data = imgui.render(); @@ -130,13 +144,19 @@ fn main() { glow.clear(glow::COLOR_BUFFER_BIT); } - renderer.render(&window, &glow, draw_data).expect("Failed to render main viewport"); - - surface.swap_buffers(&context).expect("Failed to swap buffers"); + renderer + .render(&window, &glow, draw_data) + .expect("Failed to render main viewport"); - renderer.render_viewports(&glow, &mut imgui).expect("Failed to render viewports"); - }, - _ => {}, + surface + .swap_buffers(&context) + .expect("Failed to swap buffers"); + + renderer + .render_viewports(&glow, &mut imgui) + .expect("Failed to render viewports"); + } + _ => {} } }); } diff --git a/imgui-winit-glow-renderer-viewports/src/lib.rs b/imgui-winit-glow-renderer-viewports/src/lib.rs index a46195d..f793651 100644 --- a/imgui-winit-glow-renderer-viewports/src/lib.rs +++ b/imgui-winit-glow-renderer-viewports/src/lib.rs @@ -273,7 +273,10 @@ impl Renderer { let viewport = imgui.main_viewport_mut(); - let main_pos = main_window.inner_position().unwrap_or_default().cast::(); + let main_pos = main_window + .inner_position() + .unwrap_or_default() + .cast::(); viewport.pos = [main_pos.x, main_pos.y]; viewport.work_pos = viewport.pos; @@ -415,7 +418,8 @@ impl Renderer { .config_flags .contains(ConfigFlags::VIEWPORTS_ENABLE) { - let window_pos = window.inner_position().unwrap_or_default().cast::(); + let window_pos = + window.inner_position().unwrap_or_default().cast::(); imgui.io_mut().mouse_pos = [ position.x as f32 + window_pos.x, position.y as f32 + window_pos.y,