Compare commits

...

2 Commits

Author SHA1 Message Date
Emilia Allison 495c9eaf2a
Fix build in plate-tool-web
This is the eframe branch but like why not idk
2025-11-22 20:45:43 -05:00
Emilia Allison d39cc2e79f
Update eframe and rebuild 2025-11-22 20:45:35 -05:00
7 changed files with 647 additions and 579 deletions

1211
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
plate-tool-lib = { path = "../plate-tool-lib" }
eframe = { version = "0.30", default-features = false, features = [
eframe = { version = "0.33", default-features = false, features = [
"default_fonts",
"glow",
"wayland",

View File

@ -1,4 +1,4 @@
use eframe::egui::{self, pos2, Color32, Rounding};
use eframe::egui::{self, pos2, Color32, CornerRadius, Rounding};
use eframe::glow::OFFSET;
use plate_tool_lib::plate::PlateFormat;
use plate_tool_lib::transfer_region::Region;
@ -378,8 +378,9 @@ fn add_plate_sub(
start_y + 2.0 * radius * rows as f32,
),
},
Rounding::default(),
CornerRadius::default(),
*STROKE_DEFAULT,
egui::StrokeKind::Middle,
);
// Draw wells

View File

@ -36,9 +36,10 @@ fn tree_label(
let rect = rect.expand(visuals.expansion);
ui.painter().rect(
rect,
visuals.rounding,
visuals.corner_radius,
visuals.weak_bg_fill,
visuals.bg_stroke,
egui::StrokeKind::Middle,
);
}
ui.painter().galley(text_pos, galley, visuals.text_color());

View File

@ -523,7 +523,6 @@ fn standardize_rectangle(c1: &Well, c2: &Well) -> (Well, Well) {
}
#[cfg(debug_assertions)]
use std::fmt;
use std::{fmt::Display, ops::Mul};
#[cfg(debug_assertions)] // There should be no reason to print a transfer otherwise

View File

@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
plate-tool-lib = { path = "../plate-tool-lib" }
yew = { version = "0.21.0", features = ["csr"] }
yewdux = "0.10"
yewdux = "0.11"
wasm-bindgen = "0.2"
web-sys = { version = "0.3", features = ["FormData", "HtmlFormElement",
"HtmlDialogElement", "Blob", "Url", "Window",

View File

@ -80,7 +80,7 @@ pub struct MainState {
impl Store for MainState {
fn new(context: &yewdux::Context) -> Self {
init_listener(
storage::StorageListener::<Self>::new(storage::Area::Local),
|| storage::StorageListener::<Self>::new(storage::Area::Local),
context,
);