Merge remote-tracking branch 'origin/samual/serverlist' into samual/combined_updates

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer_join.c

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/menu.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_join.c
index 27453758a418cb59d5b0bd462c4fc644c387492e,91326ad2d5fd7498111e19c88b09588d8226623e..4636ebbdbbfe3321e25b1a2f7a18b246e414849c
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_join.c
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_join.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.c
@@@ -24,13 -24,15 +24,17 @@@ void XonoticServerListTab_fill(entity m
  
        slist  = makeXonoticServerList();
  
-       me.TR(me);
--      me.TR(me);
-               me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, _("Filter:")));
-               me.TD(me, 1, me.columns - 0.6 * 3 - 0.5, e = makeXonoticInputBox(0, string_null));
 -              me.TD(me, 1, 0.4, e = makeXonoticTextLabel(0, _("Filter:")));
 -              me.TD(me, 1, me.columns - 0.6 * 3 - 0.9 - 0.4, e = makeXonoticInputBox(0, string_null));
++      me.gotoRC(me, 0.5, 0);
++              me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Filter:")));
++              me.TD(me, 1, 2.8, e = makeXonoticInputBox(0, string_null));
                        e.onChange = ServerList_Filter_Change;
                        e.onChangeEntity = slist;
                        slist.controlledTextbox = e;
++
++      me.gotoRC(me, 0.5, 3.6);
+               me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "menu_slist_categories", ZCTX(_("SRVS^Categories"))));
+                       e.onClickEntity = slist;
+                       e.onClick = ServerList_Categories_Click;
                me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "menu_slist_showempty", ZCTX(_("SRVS^Empty"))));
                        slist.filterShowEmpty = e.checked;
                        e.onClickEntity = slist;
@@@ -41,7 -43,7 +45,7 @@@
                        e.onClick = ServerList_ShowFull_Click;
                me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "net_slist_pause", _("Pause")));
  
--      me.TR(me);
++      me.gotoRC(me, 2, 0);
                me.TD(me, 1, 1, slist.sortButton1 = makeXonoticButton(string_null, '0 0 0'));
                me.TD(me, 1, 1, slist.sortButton2 = makeXonoticButton(string_null, '0 0 0'));
                me.TD(me, 1, 1, slist.sortButton3 = makeXonoticButton(string_null, '0 0 0'));

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media.c
index 529727675d62420c1d44cdbf5abea8346f6d833e,0000000000000000000000000000000000000000..9c47ef58d5a3fceb25409a35cd53e3115cbd2552
mode 100644,000000..100644
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media.c
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.c
@@@ -1,33 -1,0 +1,33 @@@
-       me.TR(me);
 +#ifdef INTERFACE
 +CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
 +      METHOD(XonoticMediaTab, fill, void(entity))
 +      ATTRIB(XonoticMediaTab, title, string, _("Demo"))
 +      ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
 +      ATTRIB(XonoticMediaTab, rows, float, 23)
 +      ATTRIB(XonoticMediaTab, columns, float, 2)
 +      ATTRIB(XonoticMediaTab, name, string, "Media")  
 +ENDCLASS(XonoticMediaTab)
 +entity makeXonoticMediaTab();
 +#endif
 +
 +#ifdef IMPLEMENTATION
 +entity makeXonoticMediaTab()
 +{
 +      entity me;
 +      me = spawnXonoticMediaTab();
 +      me.configureDialog(me);
 +      return me;
 +}
 +void XonoticMediaTab_fill(entity me)
 +{
 +      entity mc, e;
 +      mc = makeXonoticTabController(me.rows - 2);
-       me.TR(me);
-       me.TR(me);
++
++      me.gotoRC(me, 0.5, 0);
 +              me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
 +              me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
 +
++      me.gotoRC(me, 3, 0);
 +              me.TD(me, me.rows - 2, me.columns, mc);
 +}
 +#endif