From: terencehill <piuntn@gmail.com>
Date: Mon, 10 Jan 2011 20:15:29 +0000 (+0100)
Subject: Improve layout of PlayerSetup-Weapons dialog
X-Git-Tag: xonotic-v0.5.0~316^2~2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9d693b9250e170489293dca8cf33aa6a56d92a7;p=xonotic%2Fxonotic-data.pk3dir.git

Improve layout of PlayerSetup-Weapons dialog
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
index ca6d705c6..0cc9f3368 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ CLASS(XonoticWeaponsDialog) EXTENDS(XonoticDialog)
 	METHOD(XonoticWeaponsDialog, showNotify, void(entity))
 	ATTRIB(XonoticWeaponsDialog, title, string, "Weapon settings")
 	ATTRIB(XonoticWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-	ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.5)
+	ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.4)
 	ATTRIB(XonoticWeaponsDialog, rows, float, 17)
-	ATTRIB(XonoticWeaponsDialog, columns, float, 4)
+	ATTRIB(XonoticWeaponsDialog, columns, float, 3)
 	ATTRIB(XonoticWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(XonoticWeaponsDialog)
 #endif
@@ -26,18 +26,18 @@ void XonoticWeaponsDialog_fill(entity me)
 	entity e;
 
 	me.TR(me);
-		me.TD(me, 1, 4, makeXonoticTextLabel(0, "Weapon priority list:"));
+		me.TD(me, 1, 3, makeXonoticTextLabel(0, "Weapon priority list:"));
 	me.TR(me);
-		me.TD(me, 9, 4, e = me.weaponsList = makeXonoticWeaponsList());
+		me.TD(me, 9, 3, e = me.weaponsList = makeXonoticWeaponsList());
 	me.gotoRC(me, 10, 0);
-		me.TDempty(me, 1);
+		me.TDempty(me, 0.5);
 		me.TD(me, 1, 1, e = makeXonoticButton("Up", '0 0 0'));
 			e.onClick = WeaponsList_MoveUp_Click;
 			e.onClickEntity = me.weaponsList;
 		me.TD(me, 1, 1, e = makeXonoticButton("Down", '0 0 0'));
 			e.onClick = WeaponsList_MoveDown_Click;
 			e.onClickEntity = me.weaponsList;
-	me.gotoRC(me, 11, 0);
+	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling"));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
@@ -45,9 +45,9 @@ void XonoticWeaponsDialog_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "4", "Left align"));
+		me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "4", "Left align"));
 			setDependent(e, "r_drawviewmodel", 1, 1);
-		me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "3", "Right align"));
+		me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "3", "Right align"));
 			setDependent(e, "r_drawviewmodel", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", "Flip view horizontally"));