Skip to content

Commit f50dc82

Browse files
committed
Fixes for flat customization GUI layout - insets & make top label centered
1 parent 694a4cf commit f50dc82

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/common/gui/FlatCubicGui.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@
3232
import io.github.opencubicchunks.cubicchunks.cubicgen.preset.FlatGeneratorSettings;
3333
import io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.component.UIBorderLayout;
3434
import io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.component.UIColoredPanel;
35-
import io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.component.UIMultilineLabel;
3635
import io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.component.UITabbedContainer;
3736
import mcp.MethodsReturnNonnullByDefault;
3837
import net.malisis.core.client.gui.Anchor;
3938
import net.malisis.core.client.gui.MalisisGui;
4039
import net.malisis.core.client.gui.component.UIComponent;
4140
import net.malisis.core.client.gui.component.container.UIContainer;
42-
import net.malisis.core.renderer.font.FontOptions;
4341
import net.minecraft.client.gui.GuiCreateWorld;
4442

4543
import javax.annotation.ParametersAreNonnullByDefault;
@@ -104,6 +102,7 @@ private UITabbedContainer makeTabContainer() {
104102
done.setWidth(BTN_WIDTH);
105103

106104
CwgGuiLabel label = label();
105+
label.setCentered();
107106

108107
UIBorderLayout upperLayout = new UIBorderLayout(this)
109108
.setSize(xSize, ySize)

src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/common/gui/FlatLayersTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public class FlatLayersTab implements Comparator<UIFlatTerrainLayer> {
5050
FlatLayersTab(FlatCubicGui guiFor, FlatGeneratorSettings settings1) {
5151
this.settings = settings1;
5252
this.gui = guiFor;
53-
int i = settings.layers.entrySet().size();
54-
uiLayersList = new ArrayList<UIFlatTerrainLayer>(i);
53+
int i = settings.layers.size();
54+
uiLayersList = new ArrayList<>(i);
5555
for (Entry<Integer, FlatLayer> entry : settings.layers.entrySet()) {
5656
UIFlatTerrainLayer uiLayer = new UIFlatTerrainLayer(gui, this, entry.getValue());
5757
uiLayersList.add(uiLayer);

src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/common/gui/component/UIFlatTerrainLayer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import static io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.CwgGuiFactory.label;
3434
import static io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.CwgGuiFactory.separator;
3535
import static io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.CwgGuiFactory.wrap;
36+
import static io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.FlatLayersTab.HORIZONTAL_INSETS;
37+
import static io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.FlatLayersTab.VERTICAL_INSETS;
3638

3739
import io.github.opencubicchunks.cubicchunks.cubicgen.preset.FlatLayer;
3840
import io.github.opencubicchunks.cubicchunks.cubicgen.common.gui.FlatCubicGui;
@@ -58,6 +60,7 @@ public final class UIFlatTerrainLayer extends UIVerticalTableLayout<UIFlatTerrai
5860

5961
public UIFlatTerrainLayer(FlatCubicGui guiFor, FlatLayersTab flatLayersTabFor, FlatLayer layer) {
6062
super(guiFor, 2);
63+
setInsets(VERTICAL_INSETS, VERTICAL_INSETS, HORIZONTAL_INSETS, HORIZONTAL_INSETS);
6164
this.flatLayersTab = flatLayersTabFor;
6265
this.gui = guiFor;
6366

0 commit comments

Comments
 (0)