Skip to content

Commit

Permalink
Fix merge entries dialog exceeding screen size (#8599)
Browse files Browse the repository at this point in the history
* Fix merge entries dialog exceeding screen size

* Update CHANGELOG.md
  • Loading branch information
HoussemNasri authored Mar 23, 2022
1 parent b73910a commit 1624405
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where pasting a URL was replacing + signs by spaces making the URL unreachable. [#8448](https://github.com/JabRef/jabref/issues/8448)
- We fixed an issue where creating subsidiary files from aux files created with some versions of biblatex would produce incorrect results. [#8513](https://github.com/JabRef/jabref/issues/8513)
- We fixed an issue where not all found unlinked local files were imported correctly due to some race condition. [#8444](https://github.com/JabRef/jabref/issues/8444)
- We fixed an issue where Merge entries dialog exceeds screen boundaries.

### Removed

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import javafx.scene.layout.Priority;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Screen;

import org.jabref.gui.Globals;
import org.jabref.gui.icon.IconTheme.JabRefIcons;
Expand Down Expand Up @@ -142,7 +143,8 @@ private static String getDisplayText(DiffMode mode) {
* Main function for building the merge entry JPanel
*/
private void initialize() {
setPrefWidth(800);
this.setPrefHeight(Screen.getPrimary().getBounds().getHeight() * 0.75);
this.setPrefWidth(Screen.getPrimary().getBounds().getWidth() * 0.75);

setupFields();

Expand Down

0 comments on commit 1624405

Please sign in to comment.