From e05b430b4cedc7fd020212a2b94c8b68d26f8bad Mon Sep 17 00:00:00 2001
From: Samual <samual@xonotic.org>
Date: Thu, 26 Jan 2012 17:38:00 -0500
Subject: [PATCH] Various fixes for menu

---
 qcsrc/menu/xonotic/dialog_settings_effects.c    | 5 ++---
 qcsrc/menu/xonotic/dialog_settings_misc.c       | 2 +-
 qcsrc/menu/xonotic/dialog_settings_misc_cvars.c | 4 ++--
 qcsrc/menu/xonotic/dialog_settings_video.c      | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 65e7d417a..8ef2e9d63 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -159,7 +159,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_lod", _("LOD")));
 			setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:")));
 			setDependent(e, "vid_gl20", 1, 1);
@@ -176,9 +176,8 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			e.savedValue = 0.4; // default
 		me.TD(me, 1, 2, s);
 	me.TR(me);
-		e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects")));
 		makeMulti(e, "hud_powerup");
-		me.TD(me, 1, 2, e);
 		setDependent(e, "vid_gl20", 1, 1);
 			
 	me.gotoRC(me, me.rows - 1, 0);
diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index 051520549..e743ccf2e 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -126,7 +126,7 @@ void XonoticMiscSettingsTab_fill(entity me)
 		setDependent(e, "cl_maxfps", 1, 1000);
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
 			e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
 			e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");
diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
index 5dd1c5a5b..7ebca4162 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
@@ -5,7 +5,7 @@ CLASS(XonoticCvarsDialog) EXTENDS(XonoticDialog)
 	ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings"))
 	ATTRIB(XonoticCvarsDialog, color, vector, SKINCOLOR_DIALOG_CVARS)
 	ATTRIB(XonoticCvarsDialog, intendedWidth, float, 0.8)
-	ATTRIB(XonoticCvarsDialog, rows, float, 25)
+	ATTRIB(XonoticCvarsDialog, rows, float, 24)
 	ATTRIB(XonoticCvarsDialog, columns, float, 6)
 ENDCLASS(XonoticCvarsDialog)
 #endif
@@ -40,7 +40,7 @@ void XonoticCvarsDialog_fill(entity me) // in this dialog, use SKINCOLOR_CVARLIS
 			cvarlist.controlledTextbox = e; // this COULD also be the Value box, but this leads to accidentally editing stuff
 	me.TR(me);
 		me.TD(me, me.rows - me.currentRow - 7, me.columns, cvarlist);
-	me.gotoRC(me, me.rows - 7, 0);
+	me.gotoRC(me, me.rows - 6, 0);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Setting:")));
 		me.TD(me, 1, me.columns - 1, e = makeXonoticTextLabel(0, string_null));
 			cvarlist.cvarNameBox = e;
diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index 2ee4fd0c9..81b89f7af 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -119,14 +119,14 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Intensity:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
 	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "gl_finish", _("Wait for GPU to finish each frame")));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_gl20", _("Use OpenGL 2.0 shaders (GLSL)")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "v_glslgamma", _("Use GLSL to handle color control")));
 			setDependent(e, "vid_gl20", 1, 1);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "gl_finish", _("Wait for GPU to finish each frame")));
 	if(cvar("developer"))
 	{
 		me.TR(me);
-- 
2.39.2