From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 13 Jun 2010 10:33:33 +0000 (+0300)
Subject: move/resize panels so they are always visible in panel the panel config dialog :)
X-Git-Tag: xonotic-v0.1.0preview~541^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90aa97445ada70ec63b7b3ee6d992bf2af110250;p=xonotic%2Fxonotic-data.pk3dir.git

move/resize panels so they are always visible in panel the panel config dialog :)
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index dc163b088..282cd679d 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -689,6 +689,31 @@ vector HUD_Panel_GetSize(float id)
 
 	mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
 
+	if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+	{
+		vector menu_enable_maxsize, menu_enable_size;
+		menu_enable_maxsize = '0 0 0'; // shut up FTEQCC
+		menu_enable_maxsize_x = 0.3 * vid_conwidth;
+		menu_enable_maxsize_y = 0.18 * vid_conheight;
+		if(mySize_x > mySize_y)
+		{
+			if(mySize_y > menu_enable_maxsize_y)
+			{
+				menu_enable_size_y = menu_enable_maxsize_y;
+				menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y);
+				mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+			}
+		}
+		else
+		{
+			if(mySize_x > menu_enable_maxsize_x)
+			{
+				menu_enable_size_x = menu_enable_maxsize_x;
+				menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x);
+				mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+			}
+		}
+	}
 	return mySize;
 }
 
@@ -704,6 +729,17 @@ vector HUD_Panel_GetPos(float id)
 		pos_x = vid_conwidth + pos_x;
 	if (pos_y < 0)
 		pos_y = vid_conheight + pos_y;
+
+	if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+	{
+		vector mySize, menu_enable_panelpos;
+		mySize = HUD_Panel_GetSize(id);
+		if(mySize_x > mySize_y)
+			menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
+		else
+			menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth;
+		pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos;
+	}
 	return pos;
 }
 
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 66404b16f..6768221a3 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -28,4 +28,3 @@ float hud_configure;
 
 float disable_menu_alphacheck; // 0 = enable alpha check, 1 = disable for entire hud, 2 = disable for one panel
 float menu_fade_alpha;
-