Merge pull request #11324 from JabRef/tryToFixContextMenu

      Fix context menu on second screen

Author: Siedlerchr

CHANGELOG.md

@@ -41,6 +41,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where imports to a custom group would only work for the first entry [#11085](https://github.com/JabRef/jabref/issues/11085), [#11269](https://github.com/JabRef/jabref/issues/11269)
 - We fixed an issue where a new entry was not added to the selected group [#8933](https://github.com/JabRef/jabref/issues/8933)
 - We fixed an issue where the horizontal position of the Entry Preview inside the entry editor was not remembered across restarts [#11281](https://github.com/JabRef/jabref/issues/11281)
+- We fixed an issue where the entry editor context menu was not shown correctly when JabRef is opened on a second, extended screen [#11323](https://github.com/JabRef/jabref/issues/11323), [#11174](https://github.com/JabRef/jabref/issues/11174)
 
 ### Removed
 

src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java

@@ -42,8 +42,7 @@ public void initContextMenu(final Supplier<List<MenuItem>> items) {
         setOnContextMenuRequested(event -> {
             contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs()));
             contextMenu.getItems().addAll(0, items.get());
-
-            TextInputControlBehavior.showContextMenu(this, contextMenu, event);
+            contextMenu.show(this, event.getScreenX(), event.getScreenY());
         });
     }
 

src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java

@@ -38,8 +38,7 @@ public void initContextMenu(final Supplier<List<MenuItem>> items) {
         setOnContextMenuRequested(event -> {
             contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs()));
             contextMenu.getItems().addAll(0, items.get());
-
-            TextInputControlBehavior.showContextMenu(this, contextMenu, event);
+            contextMenu.show(this, event.getScreenX(), event.getScreenY());
         });
     }
 

src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java

@@ -36,7 +36,7 @@ public OptionEditor(OptionEditorViewModel<T> viewModel) {
         comboBox.getEditor().setOnContextMenuRequested(event -> {
             ContextMenu contextMenu = new ContextMenu();
             contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(comboBox.getEditor(), Globals.getKeyPrefs()));
-            TextInputControlBehavior.showContextMenu(comboBox.getEditor(), contextMenu, event);
+            contextMenu.show(comboBox, event.getScreenX(), event.getScreenY());
         });
     }
 

src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java

@@ -19,7 +19,6 @@
 import javafx.util.StringConverter;
 
 import org.jabref.gui.Globals;
-import org.jabref.gui.fieldeditors.TextInputControlBehavior;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.model.entry.Date;
@@ -28,18 +27,18 @@
 /**
  * A date picker with configurable datetime format where both date and time can be changed via the text field and the
  * date can additionally be changed via the JavaFX default date picker. Also supports incomplete dates.
- *
+ * <p>
  * First recall how the date picker normally works: - The user selects a date in the popup, which sets {@link
  * #valueProperty()} to the selected date. - The converter ({@link #converterProperty()}) is used to transform the date
  * to a string representation and display it in the text field.
- *
+ * <p>
  * The idea is now to intercept the process and add an additional step: - The user selects a date in the popup, which
  * sets {@link #valueProperty()} to the selected date. - The date is converted to a {@link TemporalAccessor} (i.e,
  * enriched by a time component) using {@link #addCurrentTime(LocalDate)} - The string converter ({@link
  * #stringConverterProperty()}) is used to transform the temporal accessor to a string representation and display it in
  * the text field.
- *
- * Inspiration taken from https://github.com/edvin/tornadofx-controls/blob/master/src/main/java/tornadofx/control/DateTimePicker.java
+ * <p>
+ * Inspiration taken from <a href="https://github.com/edvin/tornadofx-controls/blob/master/src/main/java/tornadofx/control/DateTimePicker.java">Controlsfx DateTimePicker</a>
  */
 public class TemporalAccessorPicker extends DatePicker {
     private final ObjectProperty<TemporalAccessor> temporalAccessorValue = new SimpleObjectProperty<>(null);
@@ -58,7 +57,7 @@ public TemporalAccessorPicker() {
         getEditor().setOnContextMenuRequested(event -> {
             ContextMenu contextMenu = new ContextMenu();
             contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(getEditor(), Globals.getKeyPrefs()));
-            TextInputControlBehavior.showContextMenu(getEditor(), contextMenu, event);
+            contextMenu.show(this, event.getScreenX(), event.getScreenY());
         });
     }