From 145bd022188e4ec60f82ad6e6a39033d9f59c679 Mon Sep 17 00:00:00 2001 From: WangAooa <50331948+WangAooa@users.noreply.github.com> Date: Tue, 5 May 2020 23:54:33 +0800 Subject: [PATCH 1/2] Update MainTableColumnFactory.java fix-6175 --- .../gui/maintable/MainTableColumnFactory.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java index bde67b260aa..23a9d907230 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java +++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java @@ -2,10 +2,12 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import javax.swing.undo.UndoManager; @@ -180,15 +182,40 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List colorSet = new HashSet<>(); + for (Color groupColor : groupColors) { + if (!colorSet.contains(groupColor)) { + Rectangle groupRectangle = new Rectangle(); + groupRectangle.getStyleClass().add("groupColumnBackground"); + groupRectangle.setWidth(3); + groupRectangle.setHeight(18); + groupRectangle.setFill(groupColor); + groupRectangle.setStrokeWidth(1); + + container.getChildren().add(groupRectangle); + colorSet.add(groupColor); + } + } } String matchedGroupsString = matchedGroups.stream() From 6fb29b4f9a998cd6624dcca1e5e6357c72147791 Mon Sep 17 00:00:00 2001 From: WangAooa <50331948+WangAooa@users.noreply.github.com> Date: Wed, 6 May 2020 00:02:22 +0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 676baf7503a..972ae0cd8e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We fixed an issue where citation styles except the default "Preview" could not be used. [#56220](https://github.com/JabRef/jabref/issues/5622) - We fixed an issue where a warning was displayed when the title content is made up of two sentences. [#5832](https://github.com/JabRef/jabref/issues/5832) - We fixed an issue where an exception was thrown when adding a save action without a selected formatter in the library properties [#6069](https://github.com/JabRef/jabref/issues/6069) +- We fixed an issue that merging idnetical colors. [#6175](https://github.com/JabRef/jabref/issues/6175) ### Removed