From: terencehill <piuntn@gmail.com>
Date: Sat, 14 Nov 2020 15:28:23 +0000 (+0100)
Subject: Rearrange checkboxes in the server filter row to be less confusing; it also fixes... 
X-Git-Tag: xonotic-v0.8.5~672
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77a20332e2bb78978e8e5a57ff0fc9db99278e95;p=xonotic%2Fxonotic-data.pk3dir.git

Rearrange checkboxes in the server filter row to be less confusing; it also fixes #2512
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index d023221bd..a65a4945b 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -29,16 +29,16 @@ void XonoticServerListTab_fill(entity me)
 	slist  = makeXonoticServerList();
 
 	me.gotoRC(me, 0.5, 0);
+		me.TD(me, 1, 0.8, e = makeXonoticCheckBox(0, "menu_slist_categories", ZCTX(_("SRVS^Categories"))));
+			e.onClickEntity = slist;
+			e.onClick = ServerList_Categories_Click;
+		/* FILTER CONTROLS */
 		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(1, _("Filter:")));
 		me.TD(me, 1, 2, e = makeXonoticInputBox(0, string_null));
 			e.onChange = ServerList_Filter_Change;
 			e.onChangeEntity = slist;
 			slist.controlledTextbox = e;
-
-	me.gotoRC(me, 0.5, 2.6);
-		me.TD(me, 1, 0.75, e = makeXonoticCheckBox(0, "menu_slist_categories", ZCTX(_("SRVS^Categories"))));
-			e.onClickEntity = slist;
-			e.onClick = ServerList_Categories_Click;
+	me.gotoRC(me, 0.5, 0.8 + 0.5 + 2);
 		me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "menu_slist_showempty", ZCTX(_("SRVS^Empty")),
 			_("Show empty servers")));
 			slist.filterShowEmpty = e.checked;
@@ -54,11 +54,13 @@ void XonoticServerListTab_fill(entity me)
 			slist.filterShowLaggy = e.checked;
 			e.onClickEntity = slist;
 			e.onClick = ServerList_ShowLaggy_Click;
-		me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "net_slist_pause", _("Pause"),
-			_("Pause updating the server list to prevent servers from \"jumping around\"")));
-		me.TD(me, 1, 1, e = makeXonoticButton_T(_("Refresh"), '0 0 0', _("Reload the server list")));
+		/* END FILTER CONTROLS */
+		me.TDempty(me, 0.1);
+		me.TD(me, 1, 0.8, e = makeXonoticButton_T(_("Refresh"), '0 0 0', _("Reload the server list")));
 			e.onClick = XonoticServerListTab_refresh;
 			e.onClickEntity = slist;
+		me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "net_slist_pause", _("Pause"),
+			_("Pause updating the server list to prevent servers from \"jumping around\"")));
 
 	me.gotoRC(me, 2, 0);
 		me.TD(me, 1, 1, slist.sortButton1 = makeXonoticButton(string_null, '0 0 0'));
@@ -87,13 +89,11 @@ void XonoticServerListTab_fill(entity me)
 			e.onClickEntity = slist;
 			slist.infoButton = e;
 	me.TR(me);
-	
 		/*
 		me.TD(me, 1, 1, e = makeXonoticCommandButton_T(_("Disconnect"), '0 0 0', "disconnect", 0,
 			_("Disconnect from the server")));
 			slist.disconnectButton = e;
 		*/
-
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("Join!"), '0 0 0'));
 			e.onClick = ServerList_Connect_Click;
 			e.onClickEntity = slist;