improve layout of merge dialog

Author: Siedlerchr

src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java

@@ -30,15 +30,16 @@ public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewM
         this.getDialogPane().setPrefSize(800, 600);
 
         tree = new ListView<>(FXCollections.observableArrayList(changes));
-        tree.setPrefWidth(190);
+        tree.setPrefWidth(160);
         EasyBind.subscribe(tree.getSelectionModel().selectedItemProperty(), this::selectedChangeChanged);
 
         SplitPane pane = new SplitPane();
-        pane.setDividerPositions(0.25);
+        pane.setDividerPositions(0.2);
         ScrollPane scroll = new ScrollPane(tree);
         scroll.setFitToHeight(true);
         scroll.setFitToWidth(true);
         pane.getItems().addAll(scroll, infoPanel);
+        pane.setResizableWithParent(scroll, false);
 
         getDialogPane().setContent(pane);
 

src/main/java/org/jabref/gui/mergeentries/MergeEntries.java

@@ -128,7 +128,7 @@ private void initialize() {
         ColumnConstraints columnLabel = new ColumnConstraints();
         columnLabel.setHgrow(Priority.NEVER);
         ColumnConstraints columnValues = new ColumnConstraints();
-        columnValues.setHgrow(Priority.ALWAYS);
+        columnValues.setHgrow(Priority.NEVER);
         columnValues.setPercentWidth(40);
         ColumnConstraints columnSelect = new ColumnConstraints();
         columnSelect.setHgrow(Priority.NEVER);
@@ -233,7 +233,9 @@ private void setupEntryTypeRow(GridPane mergePanel) {
     private void setupHeadingRows(GridPane mergePanel) {
         // Set headings
         for (int i = 0; i < 6; i++) {
-            mergePanel.add(new Label(columnHeadings.get(i)), i, 0);
+            Label colHeading = new Label(columnHeadings.get(i));
+            colHeading.setMinWidth(USE_PREF_SIZE);
+            mergePanel.add(colHeading, i, 0);
         }
     }