diff options
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/config')
4 files changed, 16 insertions, 8 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/Config.java b/src/main/java/kr/syeyoung/dungeonsguide/config/Config.java index 5652a2e5..e001d6f4 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/Config.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/Config.java @@ -15,7 +15,7 @@ public class Config { public static void loadConfig(File f) throws IOException { try { - configuration = (JsonObject) new JsonParser().parse(new InputStreamReader(new FileInputStream(Config.f = f))); + configuration = (JsonObject) new JsonParser().parse(new InputStreamReader(new FileInputStream(Config.f = f == null ? Config.f : f))); } catch (Exception e) { configuration = new JsonObject(); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java index a234249b..bf2f811a 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterConfig.java @@ -18,7 +18,14 @@ import java.util.Arrays; public class GuiParameterConfig extends GuiScreen { - private MPanel mainPanel = new MPanel(); + private MPanel mainPanel = new MPanel() { + @Override + public void onBoundsUpdate() { + for (MPanel childComponent : getChildComponents()) { + childComponent.setSize(new Dimension(getBounds().width - 10, childComponent.getSize().height)); + } + } + }; private GuiScreen before; private AbstractFeature feature; @@ -38,6 +45,7 @@ public class GuiParameterConfig extends GuiScreen { } }); mainPanel.add(save); + mainPanel.setBackgroundColor(new Color(17, 17, 17, 179)); } @@ -58,12 +66,15 @@ public class GuiParameterConfig extends GuiScreen { int heights = 0; within = null; for (MPanel panel:mainPanel.getChildComponents()) { - panel.setPosition(new Point(0, -offsetY + heights)); + panel.setPosition(new Point(5, -offsetY + heights + 5)); heights += panel.getBounds().height; if (panel.getBounds().contains(mouseX - mainPanel.getBounds().x, mouseY - mainPanel.getBounds().y)) within = panel; } mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GlStateManager.color(1,1,1,1); if (within instanceof MParameter) { FeatureParameter feature = ((MParameter) within).getParameter(); GlStateManager.pushAttrib(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java index 7b993a11..c3f18103 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java @@ -32,8 +32,6 @@ public class GuiParameterValueEdit extends GuiScreen { } }; - private DungeonRoom dungeonRoom; - private MPanel currentValueEdit; @@ -52,15 +50,13 @@ public class GuiParameterValueEdit extends GuiScreen { public GuiParameterValueEdit(final Object object, final GuiParameterConfig prev) { try { - this.onUpdate = onUpdate; - dungeonRoom = EditingContext.getEditingContext().getRoom(); this.editingObj = object; mainPanel.setBackgroundColor(new Color(17, 17, 17, 179)); { currentValueEdit = new MPanel() { @Override public void resize(int parentWidth, int parentHeight) { - setBounds(new Rectangle(0, 0, parentWidth, parentHeight - 20)); + setBounds(new Rectangle(5, 5, parentWidth-10, parentHeight - 25)); } }; mainPanel.add(currentValueEdit); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java index 882de0e4..efa3b4fd 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java @@ -76,6 +76,7 @@ public class MParameter extends MPanel { add(button); label2 = button; } + setSize(new Dimension(100,20)); } @Override |