From 69b594fd8b87d7e5270df4ffd1495a67b07446de Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 12 Sep 2021 00:19:06 +0200 Subject: [PATCH] project: Move MacOSPopupFactory --- .../client/util/MacOSPopupFactory.java | 12 +++++- .../client/util/MacOSPopupFactory.java | 42 ------------------- 2 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java diff --git a/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java b/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java index 8e9f14551a..62a91abed8 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MacOSPopupFactory.java @@ -24,11 +24,19 @@ */ package net.runelite.client.util; +import java.awt.Component; +import javax.swing.Popup; import javax.swing.PopupFactory; /** - * Dummy popup factory for Java 8 + * Popup factory for Java 11 which forces heavyweight popups. Lightweight popups do not render correctly + * over AWT canvases on OSX. */ class MacOSPopupFactory extends PopupFactory { -} + @Override + protected Popup getPopup(Component owner, Component contents, int x, int y, boolean isHeavyWeightPopup) throws IllegalArgumentException + { + return super.getPopup(owner, contents, x, y, true); + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java b/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java deleted file mode 100644 index 62a91abed8..0000000000 --- a/runelite-client/src/main/java11/net/runelite/client/util/MacOSPopupFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2021, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.util; - -import java.awt.Component; -import javax.swing.Popup; -import javax.swing.PopupFactory; - -/** - * Popup factory for Java 11 which forces heavyweight popups. Lightweight popups do not render correctly - * over AWT canvases on OSX. - */ -class MacOSPopupFactory extends PopupFactory -{ - @Override - protected Popup getPopup(Component owner, Component contents, int x, int y, boolean isHeavyWeightPopup) throws IllegalArgumentException - { - return super.getPopup(owner, contents, x, y, true); - } -} \ No newline at end of file