fix: apply colors from conditional formatting #6824
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sissbruecker
commented
Nov 15, 2024
Comment on lines
+420
to
+423
| declaredMethod = rule.getClass().getDeclaredMethod("getDxf", | ||
| boolean.class); | ||
| declaredMethod.setAccessible(true); | ||
| realRule = (CTCfRule) declaredMethod.invoke(rule); | ||
| CTDxf dxf = workbook.getStylesSource().getCTStylesheet().getDxfs() | ||
| .getDxfArray((int) realRule.getDxfId()); | ||
| return dxf; | ||
| return (CTDxf) declaredMethod.invoke(rule, false); |
There was a problem hiding this comment.
This is the main part of the fix which allows to retrieve the font and background pattern config from the conditional formatting rule.
| @@ -288,6 +288,11 @@ public String getBackgroundColorCSS(ConditionalFormattingRule rule) { | |||
|
|
|||
| // CF rules have tint in bgColor but not the XSSFColor. | |||
| return styleColor(themeColor, bgColor.getTint()); | |||
| } else if (bgColor.isSetIndexed()) { | |||
There was a problem hiding this comment.
This allows using an indexed color as font / background color.
| @@ -14,16 +14,19 @@ public class ColorConverterUtil implements Serializable { | |||
|
|
|||
| public static String toRGBA(byte[] argb) { | |||
| int rgba[] = new int[3]; | |||
| for (int i = 1; i < argb.length; i++) { | |||
| boolean hasAlpha = argb.length == 4; | |||
There was a problem hiding this comment.
Apparently XSSFColor can either hold a byte array with three elements for an RGB color or an array with four elements for an ARGB color. This fixes the logic to also handle RGB byte arrays.
DiegoCardoso
approved these changes
Nov 18, 2024
|
vaadin-bot
pushed a commit
that referenced
this pull request
Nov 18, 2024
sissbruecker
added a commit
that referenced
this pull request
Nov 18, 2024
Co-authored-by: Sascha Ißbrücker <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes logic for retrieving text and background color from formatting rules and adds handling of indexed and RGB colors.
Fixes #6819