Fixed focus lost on right click. (#921)

FXMisc · Mar 23, 2020 · fe947d0 · fe947d0
1 parent c22bb10
commit fe947d0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledAreaBehavior.java b/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledAreaBehavior.java
@@ -260,7 +260,7 @@ class GenericStyledAreaBehavior {
 
  InputMapTemplate<GenericStyledAreaBehavior, ? super ContextMenuEvent> contextMenuEventTemplate = consumeWhen(
  EventPattern.eventType(ContextMenuEvent.CONTEXT_MENU_REQUESTED),
- b -> !b.view.isDisabled() && b.view.isContextMenuPresent(),
+ b -> !b.view.isDisabled(),
  GenericStyledAreaBehavior::showContextMenu
  );
 
@@ -464,11 +464,13 @@ private void skipToNextWord(SelectionPolicy selectionPolicy) {
  * ********************************************************************** */
 
  private void showContextMenu(ContextMenuEvent e) {
- ContextMenu menu = view.getContextMenu();
- double xOffset = view.getContextMenuXOffset();
- double yOffset = view.getContextMenuYOffset();
-
- menu.show(view, e.getScreenX() + xOffset, e.getScreenY() + yOffset);
+ view.requestFocus();
+ if ( view.isContextMenuPresent() ) {
+ ContextMenu menu = view.getContextMenu();
+ double x = e.getScreenX() + view.getContextMenuXOffset();
+ double y = e.getScreenY() + view.getContextMenuYOffset();
+ menu.show( view, x, y );
+ }
  }
 
  private void handleShiftPress(MouseEvent e) {