[Orxonox-commit 1898] r6615 - in code/branches/hudelements/data/gui: layouts scripts

[sfluecki at orxonox.net]

Author: sfluecki
Date: 2010-03-24 09:39:54 +0100 (Wed, 24 Mar 2010)
New Revision: 6615

Modified:
   code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
   code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
Log:
Gr?\195?\182ssenangaben / Ausrichtung von Close_button & Titelbar im PickupHUD angepasst. Sicherheitsabfrage des Close_buttons entfernt

Modified: code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
===================================================================
--- code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-24 08:11:12 UTC (rev 6614)
+++ code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-24 08:39:54 UTC (rev 6615)
@@ -13,18 +13,21 @@
 			<Property Name="Alpha" Value="0.3" />
 			<!--Event Name="Clicked" Function="InGameMenu.button_return_clicked"/-->
 			<Window Type="TaharezLook/StaticText" Name="orxonox/InGamePickupHUD_PickupTitle" >
+				<Property Name="Alpha" Value="0.8"/>
 				<Property Name="Text" Value="Pickup List" />
 				<Property Name="Font" Value="BlueHighway-10" />
 				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedAreaRect" Value="{{0,5},{0,5},{1,-40},{0,30}}" />
+				<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,-20},{0,20}}" />
 			</Window>
 			<Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
-			<Property Name="Font" Value="BlueHighway-12" />
-			<Property Name="Text" Value="X" />
-			<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-			<Property Name="UnifiedAreaRect" Value="{{0,85},{0,5},{1,-5},{0,30}}" />
-			<Property Name="Alpha" Value="0.7" />
-			<Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
+			        <Property Name="Alpha" Value="0.8" />
+				<Property Name="Font" Value="BlueHighway-12" />
+				<Property Name="Text" Value="X" />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedAreaRect" Value="{{1,-20},{0,0},{1,0},{0,20}}" />
+				<!-- alle Grössen / anordnungen angepasst - da überschneidungen von absoluten
+				und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
+				<Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
 			</Window>
 			
 		</Window>

Modified: code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
===================================================================
--- code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-24 08:11:12 UTC (rev 6614)
+++ code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-24 08:39:54 UTC (rev 6615)
@@ -27,7 +27,6 @@
 
 function P.close_button_clicked()
     hideGUI("InGamePickupHUD")
-    openDecisionPopup( "SEMI IS absolutely the BEST")
 end
 
 return P