Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
atomic
2024-04-06 21:59:47 -04:00
parent 87b154209f
commit 96a82260f4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -405,10 +405,11 @@ public class JoinDialog extends BaseDialog{
Table[] groupTable = {null, null}; Table[] groupTable = {null, null};
boolean favorite = group.favorite();
if(group.prioritized){ if(group.prioritized){
addHeader(groupTable, group, hidden, false); addHeader(groupTable, group, hidden, favorite, false);
} else if (group.favorite()) { } else if (favorite) {
addHeader(groupTable, group, hidden, true); addHeader(groupTable, group, hidden, true, true);//weird behaviour if false?
} }
//table containing all groups //table containing all groups
for(String address : group.addresses){ for(String address : group.addresses){
@@ -433,9 +434,9 @@ public class JoinDialog extends BaseDialog{
|| (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return; || (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return;
if(groupTable[0] == null){ if(groupTable[0] == null){
addHeader(groupTable, group, hidden, true); addHeader(groupTable, group, hidden, favorite, true);
}else if(!groupTable[0].visible){ }else if(!groupTable[0].visible){
addHeader(groupTable, group, hidden, true); addHeader(groupTable, group, hidden, favorite, true);
} }
addCommunityHost(res, groupTable[1]); 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){ if(groupTable[0] == null){
global.table(t -> groupTable[0] = t).fillX().left().row(); global.table(t -> groupTable[0] = t).fillX().left().row();
} }
@@ -466,14 +467,13 @@ public class JoinDialog extends BaseDialog{
//button for showing/hiding servers //button for showing/hiding servers
ImageButton[] image = {null, null}; ImageButton[] image = {null, null};
image[0] = head.button(Icon.star, new ImageButton.ImageButtonStyle(){{ 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; imageDownColor = Color.white;
}}, () -> { }}, () -> {
group.setFavorite(!group.favorite()); group.setFavorite(!group.favorite());
image[0].getStyle().imageUpColor = group.favorite() ? Pal.accent : Pal.lightishGray; image[0].getStyle().imageUpColor = group.favorite() ? Pal.accent : Pal.lightishGray;
}).size(40f).get(); }).size(40f).get();
image[0].getStyle().imageUpColor = group.favorite() ? Pal.accent : Pal.lightishGray; image[0].getStyle().imageUpColor = favorite ? Pal.accent : Pal.lightishGray;
image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden")));
//button for showing/hiding servers //button for showing/hiding servers
image[1] = head.button(hidden ? Icon.eyeOffSmall : Icon.eyeSmall, Styles.grayi, () -> { image[1] = head.button(hidden ? Icon.eyeOffSmall : Icon.eyeSmall, Styles.grayi, () -> {
@@ -483,7 +483,7 @@ public class JoinDialog extends BaseDialog{
groupTable[0].remove(); groupTable[0].remove();
} }
}).size(40f).get(); }).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(); }).width(targetWidth() * columns()).padBottom(-2).row();
groupTable[1] = groupTable[0].row().table().top().left().grow().get(); groupTable[1] = groupTable[0].row().table().top().left().grow().get();