This commit is contained in:
Simon Gardling 2022-06-12 15:21:10 -04:00
parent 05ca9f5946
commit e40d6be883
3 changed files with 15 additions and 11 deletions

18
Cargo.lock generated
View File

@ -685,7 +685,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#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@ -705,7 +705,7 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.18.1" version = "0.18.1"
source = "git+https://github.com/Titaniumtown/egui.git#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"ahash", "ahash",
"epaint", "epaint",
@ -717,7 +717,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#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"arboard", "arboard",
"egui", "egui",
@ -731,7 +731,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#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@ -751,7 +751,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#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@ -760,7 +760,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.18.1" version = "0.18.1"
source = "git+https://github.com/Titaniumtown/egui.git#3d704efe12e0b8d60d3d8af254a6394fed787761" source = "git+https://github.com/Titaniumtown/egui.git#8defc5d340600618101a8f9a6a935cd739071b82"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@ -2034,7 +2034,7 @@ dependencies = [
[[package]] [[package]]
name = "ruzstd" name = "ruzstd"
version = "0.2.4" version = "0.2.4"
source = "git+https://github.com/KillingSpark/zstd-rs.git#7eff233425f20c2e1d60e3c7c20a5f6fc684da78" source = "git+https://github.com/KillingSpark/zstd-rs.git#b354d185315df90a84d0cbec311703d3c5a10963"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"twox-hash", "twox-hash",
@ -2069,9 +2069,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.9" version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"
[[package]] [[package]]
name = "serde" name = "serde"

View File

@ -53,7 +53,11 @@ cfg_if::cfg_if! {
// Used in order to hook into `panic!()` to log in the browser's console // Used in order to hook into `panic!()` to log in the browser's console
tracing_wasm::set_as_global_default(); tracing_wasm::set_as_global_default();
eframe::start_web("canvas", Box::new(|cc| Box::new(math_app::MathApp::new(cc)))) eframe::start_web("canvas", eframe::WebOptions {
follow_system_theme: false,
default_theme: eframe::Theme::Dark
},
Box::new(|cc| Box::new(math_app::MathApp::new(cc))))
} }
} }
} }

View File

@ -547,7 +547,7 @@ impl App for MathApp {
.resizable(false) .resizable(false)
.collapsible(false) .collapsible(false)
.show(ctx, |ui| { .show(ctx, |ui| {
ui.add(egui::Label::new(&*BUILD_INFO)); ui.add(egui::Label::new(BUILD_INFO));
if let Some(ref took) = self.last_info.1 { if let Some(ref took) = self.last_info.1 {
ui.label(took); ui.label(took);