Compare commits

..

No commits in common. "495c9eaf2a511e3ce517138a3bc9612ed389a8d8" and "1ca011f69c60903aff458d9862622536d5646b19" have entirely different histories.

7 changed files with 577 additions and 645 deletions

1207
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.33", default-features = false, features = [
eframe = { version = "0.30", default-features = false, features = [
"default_fonts",
"glow",
"wayland",

View File

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

View File

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

View File

@ -523,6 +523,7 @@ 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.11"
yewdux = "0.10"
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,
);