Adjust top offsets for multiplayer window

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer.c
index bb16f1d2dfe09405a112cbd2013f3131049859e2..564c867915c15515053e45c6e69fb6c7c55878dc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.c
@@ -13,7 +13,7 @@ ENDCLASS(XonoticMultiplayerDialog)
 void XonoticMultiplayerDialog_fill(entity me)
 {
        entity mc, e;
-       mc = makeXonoticTabController(me.rows - 2);
+       mc = makeXonoticTabController(me.rows - 1);
        me.TR(me);
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"), makeXonoticServerListTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"), makeXonoticServerCreateTab()));
@@ -24,7 +24,6 @@ void XonoticMultiplayerDialog_fill(entity me)
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticPlayerSettingsTab()));
 
        me.TR(me);
-       me.TR(me);
-               me.TD(me, me.rows - 2, me.columns, mc);
+               me.TD(me, me.rows - 1, me.columns, mc);
 }
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
index 3fc6f31fe322e47bd208a0bdc1384754498defa7..6d0bd906292b7e6b53dc81adf7755274be3e8f5a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
@@ -4,7 +4,7 @@ CLASS(XonoticServerCreateTab) EXTENDS(XonoticTab)
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity))
        ATTRIB(XonoticServerCreateTab, title, string, _("Create"))
        ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticServerCreateTab, rows, float, 22)
+       ATTRIB(XonoticServerCreateTab, rows, float, 23)
        ATTRIB(XonoticServerCreateTab, columns, float, 6.2) // added extra .2 for center space 
 
        ATTRIB(XonoticServerCreateTab, mapListBox, entity, NULL)
@@ -30,6 +30,7 @@ void XonoticServerCreateTab_fill(entity me)
 {
        entity e, e0;
 
+       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Game type:")));
        me.TR(me);
@@ -98,12 +99,12 @@ void XonoticServerCreateTab_fill(entity me)
                        e.onClickEntity = main.advancedDialog;
                        main.advancedDialog.refilterEntity = me.mapListBox;
 
-       me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+       me.gotoRC(me, 1, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.mapListBox = makeXonoticMapList();
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Map list:")));
                        makeCallback(e, me.mapListBox, me.mapListBox.refilterCallback);
        me.TR(me);
-               me.TD(me, me.rows - 4, 3, me.mapListBox);
+               me.TD(me, me.rows - 5, 3, me.mapListBox);
        me.gotoRC(me, me.rows - 3, 3.5);
                me.TDempty(me, 0.25);
                me.TD(me, 1, 1.125, e = makeXonoticButton(_("Select all"), '0 0 0'));

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.c b/qcsrc/menu/xonotic/dialog_multiplayer_join.c
index 02d3b410209a0af2bdf371309a45ea7325f57906..27453758a418cb59d5b0bd462c4fc644c387492e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.c
@@ -3,7 +3,7 @@ CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))
        ATTRIB(XonoticServerListTab, title, string, _("Join"))
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticServerListTab, rows, float, 22)
+       ATTRIB(XonoticServerListTab, rows, float, 23)
        ATTRIB(XonoticServerListTab, columns, float, 6.5)
 ENDCLASS(XonoticServerListTab)
 entity makeXonoticServerListTab();
@@ -25,8 +25,9 @@ void XonoticServerListTab_fill(entity me)
        slist  = makeXonoticServerList();
 
        me.TR(me);
-               me.TD(me, 1, 0.4, e = makeXonoticTextLabel(0, _("Filter:")));
-               me.TD(me, 1, me.columns - 0.6 * 3 - 0.4, e = makeXonoticInputBox(0, string_null));
+       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));
                        e.onChange = ServerList_Filter_Change;
                        e.onChangeEntity = slist;
                        slist.controlledTextbox = e;
@@ -47,7 +48,7 @@ void XonoticServerListTab_fill(entity me)
                me.TD(me, 1, 1, slist.sortButton4 = makeXonoticButton(string_null, '0 0 0'));
                me.TD(me, 1, 1, slist.sortButton5 = makeXonoticButton(string_null, '0 0 0'));
        me.TR(me);
-               me.TD(me, me.rows - 4, me.columns, slist);
+               me.TD(me, me.rows - 5, me.columns, slist);
 
        me.gotoRC(me, me.rows - 2, 0);
                me.TD(me, 1, 0.6, e = makeXonoticTextLabel(0, _("Address:")));

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.c b/qcsrc/menu/xonotic/dialog_multiplayer_media.c
index a644557a5479755396a1cf5d4ad1ef05a31bd07f..529727675d62420c1d44cdbf5abea8346f6d833e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.c
@@ -3,7 +3,7 @@ CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
        ATTRIB(XonoticMediaTab, title, string, _("Demo"))
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMediaTab, rows, float, 22)
+       ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 2)
        ATTRIB(XonoticMediaTab, name, string, "Media")  
 ENDCLASS(XonoticMediaTab)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
index 893178e48c049ff0a3d2cd1a113850c773160928..4376bf9ddea4a91bce004969b9c730d7002c3883 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
@@ -3,8 +3,8 @@ CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))
        ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))
        ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticDemoBrowserTab, rows, float, 20)
-       ATTRIB(XonoticDemoBrowserTab, columns, float, 4)
+       ATTRIB(XonoticDemoBrowserTab, rows, float, 21)
+       ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)
        ATTRIB(XonoticDemoBrowserTab, name, string, "DemoBrowser")      
 ENDCLASS(XonoticDemoBrowserTab)
 entity makeXonoticDemoBrowserTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c
index d154af0532ed7c371d812ee672ce499a8ae7df24..d4626d4c406b1a39ce75dc307742832af7e4d18b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c
@@ -3,7 +3,7 @@ CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))
        ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot")
        ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
-       ATTRIB(XonoticScreenshotBrowserTab, rows, float, 20)
+       ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21)
        ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5)
        ATTRIB(XonoticScreenshotBrowserTab, name, string, "ScreenshotBrowser")
        

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 052f05ef3b0a46419903eb480b571f946eb79856..d542536fa4720e1db7b2b4921beb79a97344b9c3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -4,7 +4,7 @@ CLASS(XonoticPlayerSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticPlayerSettingsTab, draw, void(entity))
        ATTRIB(XonoticPlayerSettingsTab, title, string, _("Profile"))
        ATTRIB(XonoticPlayerSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticPlayerSettingsTab, rows, float, 22)
+       ATTRIB(XonoticPlayerSettingsTab, rows, float, 23)
        ATTRIB(XonoticPlayerSettingsTab, columns, float, 6.2) // added extra .2 for center space 
        ATTRIB(XonoticPlayerSettingsTab, playerNameLabel, entity, NULL)
        ATTRIB(XonoticPlayerSettingsTab, playerNameLabelAlpha, float, 0)
@@ -33,6 +33,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
        entity e, pms, label, box;
        float i;
 
+       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 0.5, me.playerNameLabel = makeXonoticTextLabel(0, _("Name:")));
                        me.playerNameLabelAlpha = me.playerNameLabel.alpha;
@@ -84,7 +85,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
        me.TR(me);
        
 
-       me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+       me.gotoRC(me, 1, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TDempty(me, 1);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Model:")));
        me.TR(me);
@@ -97,7 +98,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
                        e.onClick = PlayerModelSelector_Next_Click;
                        e.onClickEntity = pms;
 
-       me.gotoRC(me, 14, 3.533); me.setFirstColumn(me, me.currentColumn);
+       me.gotoRC(me, 15, 3.533); me.setFirstColumn(me, me.currentColumn);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color:")));
                for(i = 0; i < 15; ++i)
@@ -106,7 +107,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
                                me.TR(me);
                        me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0');
                }
-       me.gotoRC(me, 14, 4.866); me.setFirstColumn(me, me.currentColumn);
+       me.gotoRC(me, 15, 4.866); me.setFirstColumn(me, me.currentColumn);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color:")));
                for(i = 0; i < 15; ++i)