aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide/gui
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-07-26 11:18:24 +0900
committersyeyoung <cyong06@naver.com>2021-07-26 11:18:24 +0900
commit132378adb3407b1238c3958070c584fdb3adb6cd (patch)
treefd3216b4279c79a8afd6f129661c8612ff77fee1 /src/main/java/kr/syeyoung/dungeonsguide/gui
parentf3626ed31e844393da1a293eab8e4aa760a8de06 (diff)
downloadSkyblock-Dungeons-Guide-132378adb3407b1238c3958070c584fdb3adb6cd.tar.gz
Skyblock-Dungeons-Guide-132378adb3407b1238c3958070c584fdb3adb6cd.tar.bz2
Skyblock-Dungeons-Guide-132378adb3407b1238c3958070c584fdb3adb6cd.zip
Fix tabbed pane not setting parent
Fix RoomMatcher only detecting for rotation=1
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/gui')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java1
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTabbedPane.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
index 0f842b34..84cccdf5 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
@@ -101,6 +101,7 @@ public class MPanel {
}
public void remove(MPanel panel) {
+ if (panel != null)
panel.setParent(null);
this.childComponents.remove(panel);
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTabbedPane.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTabbedPane.java
index f26fd956..ba56679b 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTabbedPane.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTabbedPane.java
@@ -67,6 +67,7 @@ public class MTabbedPane extends MPanel {
panel2.add(panel);
panel2.setBackgroundColor(background2);
tabs.put(tab, panel2);
+ panel2.setParent(this);
panel2.setBounds(new Rectangle(1,16,getBounds().width-2, getBounds().height-17));
FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;