emilia
/
plate-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update eframe and rebuild

This commit is contained in:
Emilia Allison 2025-11-22 20:37:45 -05:00
parent 1ca011f69c
commit d39cc2e79f
No known key found for this signature in database
GPG Key ID: FEC1CE6360EEC9A8
5 changed files with 641 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1196
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
plate-tool-eframe/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
plate-tool-lib = { path = "../plate-tool-lib" } 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", "default_fonts",
"glow", "glow",
"wayland", "wayland",

5
plate-tool-eframe/src/plate.rs
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 eframe::glow::OFFSET;
use plate_tool_lib::plate::PlateFormat; use plate_tool_lib::plate::PlateFormat;
use plate_tool_lib::transfer_region::Region; use plate_tool_lib::transfer_region::Region;
@ -378,8 +378,9 @@ fn add_plate_sub(
start_y + 2.0 * radius * rows as f32, start_y + 2.0 * radius * rows as f32,
), ),
}, },
Rounding::default(), CornerRadius::default(),
*STROKE_DEFAULT, *STROKE_DEFAULT,
egui::StrokeKind::Middle,
); );
// Draw wells // Draw wells

3
plate-tool-eframe/src/tree.rs
View File

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

1
plate-tool-lib/src/transfer_region.rs
View File

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