Skip to content

Commit c9cb919

Browse files
merge: #127 by MerchantCalico
feat: Center text GUI at lower GUI sizes.
2 parents ebe306c + 1a575e5 commit c9cb919

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/TextBlockEditScreen.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,17 @@ public void init() {
6363
SelectionManager.makeClipboardSetter(this.client),
6464
(string) -> true);
6565

66+
int middle = width / 2;
67+
6668
ButtonWidget decreaseSize = ButtonWidget.builder(Text.literal("-"), action -> {
6769
this.textBlockEntity.scale = Math.max(0, this.textBlockEntity.scale - (Screen.hasShiftDown() ? 1F : 0.125F));
6870
this.textBlockEntity.renderDirty = true;
69-
}).dimensions(80, 0, 20, 20).build();
71+
}).dimensions(middle - 130, 0, 20, 20).build();
7072

7173
ButtonWidget increaseSize = ButtonWidget.builder(Text.literal("+"), action -> {
7274
this.textBlockEntity.scale += Screen.hasShiftDown() ? 1F : 0.125F;
7375
this.textBlockEntity.renderDirty = true;
74-
}).dimensions(100, 0, 20, 20).build();
76+
}).dimensions(middle - 110, 0, 20, 20).build();
7577

7678
this.changeAlignment = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.alignment", this.textBlockEntity.textAlignment), action -> {
7779
switch (textBlockEntity.textAlignment) {
@@ -84,17 +86,17 @@ public void init() {
8486
this.textBlockEntity.renderDirty = true;
8587

8688
this.changeAlignment.setMessage(Text.stringifiedTranslatable("gui.glowcase.alignment", this.textBlockEntity.textAlignment));
87-
}).dimensions(120 + innerPadding, 0, 160, 20).build();
89+
}).dimensions(middle - 90 + innerPadding, 0, 160, 20).build();
8890

8991
this.shadowToggle = CheckboxWidget.builder(Text.translatable("gui.glowcase.shadow"), this.textRenderer)
9092
.checked(this.textBlockEntity.shadow)
9193
.callback((widget, checked) -> {
9294
this.textBlockEntity.shadow = checked;
9395
this.textBlockEntity.renderDirty = true;
9496
})
95-
.pos(120 + innerPadding, 20 + innerPadding).build();
97+
.pos(middle - 90 + innerPadding, 20 + innerPadding).build();
9698

97-
this.colorEntryWidget = new TextFieldWidget(this.client.textRenderer, 280 + innerPadding * 2, 0, 64, 20, Text.empty());
99+
this.colorEntryWidget = new TextFieldWidget(this.client.textRenderer, middle + 70 + innerPadding * 2, 0, 64, 20, Text.empty());
98100
this.colorEntryWidget.setTooltip(Tooltip.of(Text.translatable("gui.glowcase.color")));
99101
this.colorEntryWidget.setText(ColorUtil.toAlphaHex(this.textBlockEntity.color));
100102
this.colorEntryWidget.setChangedListener(string -> {
@@ -110,7 +112,7 @@ public void init() {
110112
});
111113
});
112114

113-
this.backgroundColorEntryWidget = new TextFieldWidget(this.client.textRenderer, 346 + innerPadding * 2, 0, 64, 20, Text.empty());
115+
this.backgroundColorEntryWidget = new TextFieldWidget(this.client.textRenderer, middle + 136 + innerPadding * 2, 0, 64, 20, Text.empty());
114116
this.backgroundColorEntryWidget.setTooltip(Tooltip.of(Text.translatable("gui.glowcase.background_color")));
115117
this.backgroundColorEntryWidget.setText(ColorUtil.toAlphaHex(this.textBlockEntity.backgroundColor));
116118
this.backgroundColorEntryWidget.setChangedListener(string -> {
@@ -132,12 +134,12 @@ public void init() {
132134
this.textBlockEntity.renderDirty = true;
133135

134136
this.zOffsetToggle.setMessage(Text.literal(this.textBlockEntity.zOffset.name()));
135-
}).dimensions(212, 20 + innerPadding, 72, 20).build();
137+
}).dimensions(middle + 2, 20 + innerPadding, 72, 20).build();
136138

137139
this.colorPickerWidget = ColorPickerWidget.builder(this, 216, 10).size(182, 104).build();
138140
this.colorPickerWidget.toggle(false); //start deactivated
139141

140-
this.viewDistanceField = new TextFieldWidget(this.client.textRenderer, 7, 20 + innerPadding, 83 + innerPadding, 20, Text.empty());
142+
this.viewDistanceField = new TextFieldWidget(this.client.textRenderer, middle - 203, 20 + innerPadding, 83 + innerPadding, 20, Text.empty());
141143
this.viewDistanceField.setText(String.valueOf(this.textBlockEntity.viewDistance));
142144
this.viewDistanceField.setChangedListener(s -> {
143145
if (Floats.tryParse(s) instanceof Float parsed) {
@@ -147,7 +149,7 @@ public void init() {
147149
this.viewDistanceField.setTooltip(Tooltip.of(Text.translatable("gui.glowcase.screen.text_edit.view_distance")));
148150
this.viewDistanceHelpButton = ButtonWidget.builder(Text.literal("?"), action -> {
149151
})
150-
.dimensions(7 + (83 + innerPadding) + 5, 20 + innerPadding, 20, 20).build();
152+
.dimensions(middle - 115 + innerPadding + 5, 20 + innerPadding, 20, 20).build();
151153
this.viewDistanceHelpButton.setTooltip(Tooltip.of(Text.translatable("gui.glowcase.screen.text_edit.view_distance")));
152154

153155
this.addDrawableChild(colorPickerWidget);
@@ -173,7 +175,7 @@ public void init() {
173175
this.backgroundColorEntryWidget
174176
);
175177

176-
addFormattingButtons(280, 20, innerPadding, 20, 2);
178+
addFormattingButtons(middle + 70, 20, innerPadding, 20, 2);
177179
}
178180

179181
@Override
@@ -250,7 +252,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
250252
}
251253

252254
context.getMatrices().popMatrix();
253-
context.drawTextWithShadow(client.textRenderer, Text.translatable("gui.glowcase.scale_value", this.textBlockEntity.scale), 7, 7, 0xFFFFFFFF);
255+
context.drawTextWithShadow(client.textRenderer, Text.translatable("gui.glowcase.scale_value", this.textBlockEntity.scale), width / 2 - 203, 7, 0xFFFFFFFF);
254256
colorPickerWidget.render(context, mouseX, mouseY, delta);
255257
}
256258
}

0 commit comments

Comments
 (0)