Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Integration: #2639 pass the develop settings to brush_tool (port to panels/detail/masks.rs)

aiongg3f68029b4bc8
diff --git a/crates/ui-egui/src/panels/detail/masks.rs b/crates/ui-egui/src/panels/detail/masks.rs
index ac87317b9..cf52f1f75 100644
--- a/crates/ui-egui/src/panels/detail/masks.rs
+++ b/crates/ui-egui/src/panels/detail/masks.rs
@@ -360,7 +360,7 @@ pub(super) fn mask_overlay(app: &mut LightcraftApp, ui: &mut egui::Ui, resp: &eg
return;
}
if app.ui.tool == "brush" {
- brush_tool(app, ui, resp, map, p, clip);
+ brush_tool(app, ui, resp, map, p, clip, d);
return;
}
grip_gestures(app, ui, resp, map, d, &grips);
@@ -517,7 +517,8 @@ fn object_tool(
}
/// Brush tool: the cursor, the stroke being painted and its commit.
-fn brush_tool(app: &mut LightcraftApp, ui: &mut egui::Ui, resp: &egui::Response, map: &CanvasMap, p: &egui::Painter, clip: Rect) {
+fn brush_tool(app: &mut LightcraftApp, ui: &mut egui::Ui, resp: &egui::Response, map: &CanvasMap, p: &egui::Painter, clip: Rect, d: &DevelopSettings) {
+ let active = app.session.active_mask;
let long = (map.rect.width().max(map.rect.height())) as f64;
let r = (app.ui.brush_size as f64 * long) as f32;
if let Some(h) = resp.hover_pos() {