Merge pull request #11323 from deathbeam/11318

Prevent screen marker overlays from being reset
This commit is contained in:
Tomas Slusny
2020-04-22 10:38:20 +02:00
committed by GitHub
3 changed files with 6 additions and 1 deletions

View File

@@ -49,6 +49,7 @@ public class ScreenMarkerOverlay extends Overlay
setLayer(OverlayLayer.ALWAYS_ON_TOP);
setPriority(OverlayPriority.HIGH);
setResizable(true);
setResettable(false);
}
@Override

View File

@@ -50,6 +50,7 @@ public abstract class Overlay implements LayoutableRenderableEntity
private OverlayLayer layer = OverlayLayer.UNDER_WIDGETS;
private final List<OverlayMenuEntry> menuEntries = new ArrayList<>();
private boolean resizable;
private boolean resettable = true;
protected Overlay()
{

View File

@@ -334,7 +334,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
if (SwingUtilities.isRightMouseButton(mouseEvent))
{
overlayManager.resetOverlay(currentManagedOverlay);
if (currentManagedOverlay.isResettable())
{
overlayManager.resetOverlay(currentManagedOverlay);
}
}
else if (SwingUtilities.isLeftMouseButton(mouseEvent))
{