forked from 1b-agent/opencadstudio-upstream
fix(plot): text and leader background masks plot paper-white, not black
The mask is filled with the canvas colour; plotting carried that dark colour (or the light-to-black rule) onto the sheet. Fixes #1072 Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
c8c2238d4a
commit
38fe2b0b08
3 files changed
+30
-13
No files matched your search
+17
-12
@@ -1133,21 +1133,26 @@ fn emit_wire_fills(
|
||||
if a < 0.01 {
|
||||
continue;
|
||||
}
|
||||
let mut screening = 1.0;
|
||||
let mut color_overridden = false;
|
||||
if let Some(table) = plot_style {
|
||||
if wire.aci > 0 {
|
||||
if let Some(color) = table.resolve_color(wire.aci) {
|
||||
[r, g, b] = color;
|
||||
color_overridden = true;
|
||||
if wire.bg_adapt.as_deref().is_some_and(|adapt| adapt.canvas_color) {
|
||||
// A background mask: it covers with the paper itself.
|
||||
[r, g, b] = [1.0, 1.0, 1.0];
|
||||
} else {
|
||||
let mut screening = 1.0;
|
||||
let mut color_overridden = false;
|
||||
if let Some(table) = plot_style {
|
||||
if wire.aci > 0 {
|
||||
if let Some(color) = table.resolve_color(wire.aci) {
|
||||
[r, g, b] = color;
|
||||
color_overridden = true;
|
||||
}
|
||||
screening = table.resolve_screening(wire.aci);
|
||||
}
|
||||
screening = table.resolve_screening(wire.aci);
|
||||
}
|
||||
if !color_overridden {
|
||||
[r, g, b] = adapt_text_color([r, g, b]);
|
||||
}
|
||||
[r, g, b] = plotted_color([r, g, b], a, screening, options);
|
||||
}
|
||||
if !color_overridden {
|
||||
[r, g, b] = adapt_text_color([r, g, b]);
|
||||
}
|
||||
[r, g, b] = plotted_color([r, g, b], a, screening, options);
|
||||
ops.push(Op::SetFillColor {
|
||||
col: Color::Rgb(Rgb {
|
||||
r,
|
||||
|
||||
Reference in new issue
Block a user