update egui stuff

This commit is contained in:
Simon Gardling
2022-05-24 12:32:16 -04:00
parent d4236b07c0
commit 0e48a9394d
2 changed files with 9 additions and 22 deletions

27
Cargo.lock generated
View File

@@ -658,7 +658,7 @@ checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@@ -678,7 +678,7 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.18.1" version = "0.18.1"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"ahash", "ahash",
"epaint", "epaint",
@@ -690,7 +690,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"arboard", "arboard",
"egui", "egui",
@@ -704,7 +704,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.18.1" version = "0.18.1"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@@ -724,7 +724,7 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -733,7 +733,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.18.1" version = "0.18.1"
source = "git+https://github.com/Titaniumtown/egui.git#e78cfc8076db95174f25d0460664d2ffd47a96d7" source = "git+https://github.com/Titaniumtown/egui.git#781eab1f563f17b3e20588184ce50ef85a6e6893"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@@ -826,13 +826,12 @@ dependencies = [
[[package]] [[package]]
name = "fsio" name = "fsio"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" checksum = "de6fce87c901c64837f745e7fffddeca1de8e054b544ba82c419905d40a0e1be"
dependencies = [ dependencies = [
"dunce", "dunce",
"rand", "rand",
"users",
] ]
[[package]] [[package]]
@@ -2397,16 +2396,6 @@ dependencies = [
"percent-encoding", "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]] [[package]]
name = "uuid" name = "uuid"
version = "0.8.2" version = "0.8.2"

View File

@@ -239,9 +239,7 @@ impl MathApp {
cc.egui_ctx.set_visuals(crate::style::STYLE); cc.egui_ctx.set_visuals(crate::style::STYLE);
// Set spacing // Set spacing
let mut style: egui::Style = (*cc.egui_ctx.style()).clone(); cc.egui_ctx.set_spacing(crate::style::SPACING);
style.spacing = crate::style::SPACING;
cc.egui_ctx.set_style(style);
tracing::info!("Initialized! Took: {:?}", start.elapsed()); tracing::info!("Initialized! Took: {:?}", start.elapsed());