Merge pull request #6 from JabRef/master

update 2021.3.12

CHANGELOG.md

@@ -60,6 +60,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where a non valid value as font size results in an uncaught exception. [#7415](https://github.com/JabRef/jabref/issues/7415)
 - We fixed an issue where "Merge citations" in the Openoffice/Libreoffice integration panel did not have a corresponding opposite. [#7454](https://github.com/JabRef/jabref/issues/7454)
 - We fixed an issue where drag and drop of bib files for opening resulted in uncaught exceptions [#7464](https://github.com/JabRef/jabref/issues/7464)
+- We fixed an issue where columns shrink in width when we try to enlarge JabRef window. [#6818](https://github.com/JabRef/jabref/issues/6818)
 - We fixed an issue where Content selector does not seem to work for custom fields. [#6819](https://github.com/JabRef/jabref/issues/6819)
 
 ### Removed

build.gradle

@@ -93,7 +93,7 @@ configurations {
 }
 
 javafx {
-    version = "15.0.1"
+    version = "16"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
@@ -175,6 +175,8 @@ dependencies {
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
     annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
 
+    // SNAPSHOT is required because of plain-java support
+    // See https://github.com/michel-kraemer/citeproc-java/issues/92 for details
     implementation 'de.undercouch:citeproc-java:3.0.0-SNAPSHOT'
 
     implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.1'

src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java

@@ -38,13 +38,18 @@ private Boolean initColumnSize(TableView<?> table) {
 
         if (Math.abs(totalWidth - tableWidth) > 1) {
             double totalPrefWidth = visibleLeafColumns.stream().mapToDouble(TableColumnBase::getPrefWidth).sum();
+            double currPrefWidth = 0;
             if (totalPrefWidth > 0) {
                 for (TableColumnBase col : visibleLeafColumns) {
                     double share = col.getPrefWidth() / totalPrefWidth;
                     double newSize = tableWidth * share;
 
                     // Just to make sure that we are staying under the total table width (due to rounding errors)
-                    newSize -= 2;
+                    currPrefWidth += newSize;
+                    if (currPrefWidth > tableWidth) {
+                        newSize -= currPrefWidth - tableWidth;
+                        currPrefWidth -= tableWidth;
+                    }
 
                     resize(col, newSize - col.getWidth());
                 }

src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java

@@ -68,7 +68,7 @@ private void initialize(String newStyle, CitationStyleOutputFormat newFormat) th
         if ((cslInstance == null) || !Objects.equals(newStyle, style)) {
             // lang and forceLang are set to the default values of other CSL constructors
             cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(),
-                    new DefaultAbbreviationProvider(), null, newStyle, "en-US");
+                    new DefaultAbbreviationProvider(), newStyle, "en-US");
             style = newStyle;
         }