From 96a82260f47f3abf87fd407dbc624cb30b0e36af Mon Sep 17 00:00:00 2001 From: atomic <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:59:47 -0400 Subject: [PATCH] oops --- core/src/mindustry/ui/dialogs/JoinDialog.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index b7f8b6055e..b29ee2213d 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -405,10 +405,11 @@ public class JoinDialog extends BaseDialog{ Table[] groupTable = {null, null}; + boolean favorite = group.favorite(); if(group.prioritized){ - addHeader(groupTable, group, hidden, false); - } else if (group.favorite()) { - addHeader(groupTable, group, hidden, true); + addHeader(groupTable, group, hidden, favorite, false); + } else if (favorite) { + addHeader(groupTable, group, hidden, true, true);//weird behaviour if false? } //table containing all groups for(String address : group.addresses){ @@ -433,9 +434,9 @@ public class JoinDialog extends BaseDialog{ || (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return; if(groupTable[0] == null){ - addHeader(groupTable, group, hidden, true); + addHeader(groupTable, group, hidden, favorite, true); }else if(!groupTable[0].visible){ - addHeader(groupTable, group, hidden, true); + addHeader(groupTable, group, hidden, favorite, true); } addCommunityHost(res, groupTable[1]); @@ -447,7 +448,7 @@ public class JoinDialog extends BaseDialog{ } } - void addHeader(Table[] groupTable, ServerGroup group, boolean hidden, boolean doInit){ // outlined separately + void addHeader(Table[] groupTable, ServerGroup group, boolean hidden, boolean favorite, boolean doInit){ // outlined separately if(groupTable[0] == null){ global.table(t -> groupTable[0] = t).fillX().left().row(); } @@ -466,14 +467,13 @@ public class JoinDialog extends BaseDialog{ //button for showing/hiding servers ImageButton[] image = {null, null}; image[0] = head.button(Icon.star, new ImageButton.ImageButtonStyle(){{ - imageUpColor = group.favorite() ? Pal.accent : Color.lightGray; + imageUpColor = favorite ? Pal.accent : Color.lightGray; imageDownColor = Color.white; }}, () -> { group.setFavorite(!group.favorite()); image[0].getStyle().imageUpColor = group.favorite() ? Pal.accent : Pal.lightishGray; }).size(40f).get(); - image[0].getStyle().imageUpColor = group.favorite() ? Pal.accent : Pal.lightishGray; - image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden"))); + image[0].getStyle().imageUpColor = favorite ? Pal.accent : Pal.lightishGray; //button for showing/hiding servers image[1] = head.button(hidden ? Icon.eyeOffSmall : Icon.eyeSmall, Styles.grayi, () -> { @@ -483,7 +483,7 @@ public class JoinDialog extends BaseDialog{ groupTable[0].remove(); } }).size(40f).get(); - image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden"))); + image[1].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden"))); }).width(targetWidth() * columns()).padBottom(-2).row(); groupTable[1] = groupTable[0].row().table().top().left().grow().get();