From 77a20332e2bb78978e8e5a57ff0fc9db99278e95 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 14 Nov 2020 16:28:23 +0100 Subject: [PATCH] Rearrange checkboxes in the server filter row to be less confusing; it also fixes #2512 --- qcsrc/menu/xonotic/dialog_multiplayer_join.qc | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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; -- 2.39.2