sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Sets the patternFill to solid when changing the background color

Browse Source
This commit is contained in:
Nicolás Hatcher
2024-10-10 18:38:26 +02:00
committed by Nicolás Hatcher Andrés
parent 4016eb5944
commit f26cdd3a4b
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/test/user_model/test_styles.rs
View File

@@ -145,6 +145,7 @@ fn basic_fill() {
let style = model.get_cell_style(0, 1, 1).unwrap(); let style = model.get_cell_style(0, 1, 1).unwrap();
assert_eq!(style.fill.bg_color, None); assert_eq!(style.fill.bg_color, None);
assert_eq!(style.fill.fg_color, None); assert_eq!(style.fill.fg_color, None);
assert_eq!(&style.fill.pattern_type, "none");
// bg_color // bg_color
model model
@@ -156,6 +157,7 @@ fn basic_fill() {
let style = model.get_cell_style(0, 1, 1).unwrap(); let style = model.get_cell_style(0, 1, 1).unwrap();
assert_eq!(style.fill.bg_color, Some("#F2F2F2".to_owned())); assert_eq!(style.fill.bg_color, Some("#F2F2F2".to_owned()));
assert_eq!(style.fill.fg_color, Some("#F3F4F5".to_owned())); assert_eq!(style.fill.fg_color, Some("#F3F4F5".to_owned()));
assert_eq!(&style.fill.pattern_type, "solid");
let send_queue = model.flush_send_queue(); let send_queue = model.flush_send_queue();

2
base/src/user_model/common.rs
View File

@@ -882,9 +882,11 @@ impl UserModel {
} }
"fill.bg_color" => { "fill.bg_color" => {
style.fill.bg_color = color(value)?; style.fill.bg_color = color(value)?;
style.fill.pattern_type = "solid".to_string();
} }
"fill.fg_color" => { "fill.fg_color" => {
style.fill.fg_color = color(value)?; style.fill.fg_color = color(value)?;
style.fill.pattern_type = "solid".to_string();
} }
"num_fmt" => { "num_fmt" => {
value.clone_into(&mut style.num_fmt); value.clone_into(&mut style.num_fmt);

7
webapp/src/icons/ironcalc_icon.svg Normal file
View File

@@ -0,0 +1,7 @@
<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M62.2449 0C62.2449 16.5084 55.687 32.3406 44.0138 44.0138C42.0408 45.9868 39.949 47.8137 37.7551 49.4875L37.7551 100C37.7551 83.4916 44.3131 67.6594 55.9863 55.9862C57.9593 54.0132 60.0511 52.1863 62.2449 50.5125L62.2449 0Z" fill="#F2994A"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M37.7552 0.0239258C37.7488 10.0285 33.7717 19.622 26.697 26.6968C19.6165 33.7773 10.0133 37.755 6.10352e-05 37.755V62.2448C13.7182 62.2448 26.9694 57.7164 37.7552 49.4874V0.0239258Z" fill="#F2994A"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M62.2449 99.976C62.2513 89.9713 66.2283 80.3779 73.3031 73.3031C80.3836 66.2226 89.9868 62.2449 100 62.2449V37.7551C86.2819 37.7551 73.0307 42.2835 62.2449 50.5125V99.976Z" fill="#F2994A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M44.0138 44.0138C55.687 32.3406 62.2449 16.5084 62.2449 0H37.7551V49.4875C39.949 47.8137 42.0408 45.9868 44.0138 44.0138Z" fill="#F2994A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M37.7551 99.9655C37.7551 99.977 37.7551 99.9885 37.7551 100H62.2449C62.2449 99.9912 62.2449 99.9825 62.2449 99.9737V50.5125C60.0511 52.1863 57.9593 54.0132 55.9862 55.9862C44.3212 67.6513 37.7643 83.4696 37.7551 99.9655Z" fill="#F2994A"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB