Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge entries dialog exceeding screen size #8599

Merged
merged 3 commits into from
Mar 23, 2022
Merged

Fix merge entries dialog exceeding screen size #8599

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b251c
Fix merge entries dialog exceeding screen size
HoussemNasri Mar 23, 2022
0732ac6
Update CHANGELOG.md
HoussemNasri Mar 23, 2022
723c96d
Merge branch 'main' into fix-merge-window-size
HoussemNasri Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
View file
Open in desktop
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