Merge remote-tracking branch 'upstream/master' into sharelatex

* upstream/master: Convert crossref editor to tag-like interface using JavaFX (#2840) Fix #2847: Add scrollbars to entry editor Update Localization of Greek Translations (#2895)
JabRef · Jun 10, 2017 · 1af149f · 1af149f
2 parents 6fe01c4 + b5f1e7d
commit 1af149f
Show file tree

Hide file tree

Showing 17 changed files with 745 additions and 947 deletions.
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
@@ -11,5 +11,5 @@
     -fx-hgap: 10;
     -fx-vgap: 6;
     -fx-background-color: text-area-background;
-    -fx-padding: 0 0 0 5;
+    -fx-padding: 5 0 0 5;
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -13,6 +13,7 @@
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
@@ -155,8 +156,6 @@ private Region setupPanel(JabRefFrame frame, BasePanel bPanel, boolean compresse
         }
 
         GridPane gridPane = new GridPane();
-        gridPane.setPrefSize(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
-        gridPane.setMaxSize(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
         gridPane.getStyleClass().add("editorPane");
 
         ColumnConstraints columnExpand = new ColumnConstraints();
@@ -204,7 +203,14 @@ private Region setupPanel(JabRefFrame frame, BasePanel bPanel, boolean compresse
         }
         gridPane.getStylesheets().add("org/jabref/gui/entryeditor/EntryEditor.css");
 
-        return gridPane;
+        // Warp everything in a scroll-pane
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.setContent(gridPane);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+        return scrollPane;
     }
 
     private String getPrompt(String field) {