From c2d8f244b27bb4c42c28237d184b821e9645b1b2 Mon Sep 17 00:00:00 2001 From: David Cohen Date: Thu, 14 Mar 2024 10:16:53 -0500 Subject: [PATCH 1/2] make EguiStateHandler::new() responsible for itself only Signed-off-by: David Cohen --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 635000e..8043678 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -102,11 +102,12 @@ pub fn with_sdl2( DpiScaling::Custom(custom) => default_scale * custom, }; let painter = painter::Painter::new(window, scale, shader_ver); - EguiStateHandler::new(painter) + let state_handler = EguiStateHandler::new(&painter); + (painter, state_handler) } impl EguiStateHandler { - pub fn new(painter: Painter) -> (Painter, EguiStateHandler) { + pub fn new(painter: &Painter) -> Self { let mut input = egui::RawInput { screen_rect: Some(painter.screen_rect), ..Default::default() @@ -117,14 +118,13 @@ impl EguiStateHandler { .or_default() .native_pixels_per_point = Some(painter.pixels_per_point); let native_pixels_per_point = painter.pixels_per_point; - let _self = EguiStateHandler { + Self { fused_cursor: FusedCursor::default(), pointer_pos: Pos2::new(0f32, 0f32), input, modifiers: Modifiers::default(), native_pixels_per_point, - }; - (painter, _self) + } } pub fn process_input( From 57b3d6cc2aa624fd58e3fef3f7154941c6458226 Mon Sep 17 00:00:00 2001 From: David Cohen Date: Tue, 26 Mar 2024 22:45:33 -0500 Subject: [PATCH 2/2] bump egui and self version to 0.27.0 Signed-off-by: David Cohen --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9825f56..0754a09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_sdl2_gl" -version = "0.26.2" +version = "0.27.0" authors = ["Arjun Nair "] edition = "2018" description = "Backend for Egui to use with sdl2-rs and open gl" @@ -15,7 +15,7 @@ include = ["**/*.rs", "Cargo.toml", "/shaders"] [dependencies] ahash = "~0.8" gl = "~0.14" -egui = "~0.26" +egui = "~0.27" sdl2 = { version = "~0.36" } memoffset = "0.9.0" @@ -41,4 +41,4 @@ sdl2_static-link = ["sdl2/static-link"] use_epi = ["epi"] [dev-dependencies] -egui_demo_lib = "~0.26" +egui_demo_lib = "~0.27"