From 0e48a9394dd80146cfde9ac9ff4437bd7fbc2009 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 May 2022 12:32:16 -0400 Subject: [PATCH] update egui stuff --- Cargo.lock | 27 ++++++++------------------- src/math_app.rs | 4 +--- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f10908f..311c800 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,7 +658,7 @@ checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" [[package]] name = "eframe" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "bytemuck", "egui", @@ -678,7 +678,7 @@ dependencies = [ [[package]] name = "egui" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "ahash", "epaint", @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "arboard", "egui", @@ -704,7 +704,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "bytemuck", "egui", @@ -724,7 +724,7 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "emath" version = "0.18.0" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "bytemuck", "serde", @@ -733,7 +733,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.18.1" -source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" +source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893" dependencies = [ "ab_glyph", "ahash", @@ -826,13 +826,12 @@ dependencies = [ [[package]] name = "fsio" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" +checksum = "de6fce87c901c64837f745e7fffddeca1de8e054b544ba82c419905d40a0e1be" dependencies = [ "dunce", "rand", - "users", ] [[package]] @@ -2397,16 +2396,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - [[package]] name = "uuid" version = "0.8.2" diff --git a/src/math_app.rs b/src/math_app.rs index 7102463..3e5c1cf 100644 --- a/src/math_app.rs +++ b/src/math_app.rs @@ -239,9 +239,7 @@ impl MathApp { cc.egui_ctx.set_visuals(crate::style::STYLE); // Set spacing - let mut style: egui::Style = (*cc.egui_ctx.style()).clone(); - style.spacing = crate::style::SPACING; - cc.egui_ctx.set_style(style); + cc.egui_ctx.set_spacing(crate::style::SPACING); tracing::info!("Initialized! Took: {:?}", start.elapsed());