ImageryOffsetDialog doesn't close pressing Esc

[skorbut]

1. Download some OSM data
2. Load aerial imagery, e.g. Bing
3. In the layers menu right-click on Bing -> New offset. A window appears.
4. Press Esc -> the window disappears.

I would now expect to be able to create new nodes, etc. However, it seems (based on the downloaded OSM data) that the user is now stuck in the offset-adjustment-mode, where one can adjust the imagery offset by click-and-holding the left mouse button.

The bug seems to reside somewhere at

• src/org/openstreetmap/josm/actions/ImageryAdjustAction
• src/org/openstreetmap/josm/gui/ExtendedDialog.setupEscListener()

but I was not able to find out more.

[Don-vip]

In 13269/josm:

fix #15716 - proper exit of imagery offset mapmode

[skorbut]

@Don-vip:

Thanks for your quick reaction. I have two remarks regarding your fix:

1. If I move the imagery layer using left-click and move, then decide to abort and therefore press Esc, the imagery layer will still have this unwanted offset applied. :-(
2. Would it be possible to change the code so that pressing Esc closes the imagery offset dialog even when it isn't in focus?

Thank you for your efforts!

[Don-vip]

In 13287/josm:

fix #15716 - listen to escape key outside of imagery adjust dialog, and restore correct offset when pressing it

[Don-vip]

In 13433/josm:

fix #15849, see #15716 - IAE when changing active layer while setting offset