Skip to content

Tune faction GUI sizing for Auto scale (tabs + map) #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plan3t merged 2 commits into from
Feb 17, 2026
Merged

Tune faction GUI sizing for Auto scale (tabs + map) #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cee7c5
Tune auto-scale faction UI tab and map sizing
plan3t Feb 17, 2026
cb8e7d2
Merge branch 'main' into codex/fix-ui-scaling-for-factions-mod-e1hodu
plan3t Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/main/java/com/mcprotector/client/gui/FactionMainScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import java.util.Set;

public class FactionMainScreen extends Screen {
private static final int TAB_BUTTON_HEIGHT = 16;
private static final int TAB_BUTTON_WIDTH = 66;
private static final int TAB_BUTTON_HEIGHT = 14;
private static final int TAB_BUTTON_WIDTH = 58;
private static final int PANEL_PADDING = 16;
private static final int CONTROL_TOP_OFFSET = 6;
private static final int CONTROL_ROW_SPACING = 24;
Expand All @@ -44,14 +44,14 @@ public class FactionMainScreen extends Screen {
private static final int MAP_COLOR_PERSONAL = 0xFF9C27B0;
private static final int SAFEZONE_FIELD_WIDTH = 90;
private static final int CLAIM_CONTROL_GAP = 6;
private static final int MIN_TAB_BUTTON_WIDTH = 44;
private static final int TAB_BUTTON_GAP = 3;
private static final int PANEL_CONTENT_WIDTH = 388;
private static final int TAB_COMPACT_LABEL_THRESHOLD = 58;
private static final int MIN_TAB_BUTTON_WIDTH = 38;
private static final int TAB_BUTTON_GAP = 2;
private static final int PANEL_CONTENT_WIDTH = 360;
private static final int TAB_COMPACT_LABEL_THRESHOLD = 54;
private static final int MEMBER_SECTION_BUTTON_WIDTH = 72;
private static final int MEMBER_SECTION_BUTTON_HEIGHT = 16;
private static final int MEMBER_SECTION_BUTTON_GAP = 4;
private static final int MIN_PANEL_CONTENT_WIDTH = 300;
private static final int MIN_PANEL_CONTENT_WIDTH = 280;
private static final DateTimeFormatter INVITE_TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm")
.withZone(ZoneId.systemDefault());

Expand Down Expand Up @@ -118,7 +118,9 @@ protected void init() {
super.init();
recalculateLayout();
int panelLeft = getPanelLeft();
int startX = (this.width - (FactionTab.values().length * (tabButtonWidth + TAB_BUTTON_GAP))) / 2;
int tabCount = FactionTab.values().length;
int totalTabWidth = tabCount * tabButtonWidth + (tabCount - 1) * TAB_BUTTON_GAP;
int startX = (this.width - totalTabWidth) / 2;
int y = 42;
for (FactionTab tab : FactionTab.values()) {
int x = startX + tab.ordinal() * (tabButtonWidth + TAB_BUTTON_GAP);
Expand Down Expand Up @@ -580,15 +582,18 @@ private void layoutMemberSectionButtons() {
int buttonWidth = scaledWidth(MEMBER_SECTION_BUTTON_WIDTH);
int buttonHeight = MEMBER_SECTION_BUTTON_HEIGHT;
int gap = scaledWidth(MEMBER_SECTION_BUTTON_GAP);
int right = getPanelRight();
invitesSectionButton.setWidth(buttonWidth);
invitesSectionButton.setHeight(buttonHeight);
invitesSectionButton.setX(right - buttonWidth);
invitesSectionButton.setY(panelTop + CONTROL_TOP_OFFSET + controlRowSpacing + 2);
int startX = getPanelLeft();
int y = panelTop + CONTROL_TOP_OFFSET + controlRowSpacing + 2;

membersSectionButton.setWidth(buttonWidth);
membersSectionButton.setHeight(buttonHeight);
membersSectionButton.setX(invitesSectionButton.getX() - gap - buttonWidth);
membersSectionButton.setY(invitesSectionButton.getY());
membersSectionButton.setX(startX);
membersSectionButton.setY(y);

invitesSectionButton.setWidth(buttonWidth);
invitesSectionButton.setHeight(buttonHeight);
invitesSectionButton.setX(startX + buttonWidth + gap);
invitesSectionButton.setY(y);
}

private void updateMemberSectionButtonState() {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/mcprotector/client/gui/FactionMapRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ private FactionMapRenderer() {

public static MapRegion buildMapRegion(int startY, int radius, int width, int height, int panelPadding) {
int gridSize = radius * 2 + 1;
int maxWidth = width - panelPadding * 2;
int maxHeight = height - startY - 70;
int cellSize = Math.max(7, Math.min(18, Math.min(maxWidth / gridSize, maxHeight / gridSize)));
int maxWidth = width - panelPadding * 2 - 24;
int maxHeight = height - startY - 90;
int cellSize = Math.max(6, Math.min(15, Math.min(maxWidth / gridSize, maxHeight / gridSize)));
int mapWidth = cellSize * gridSize;
int mapHeight = cellSize * gridSize;
int originX = (width - mapWidth) / 2;
Expand Down
Loading