Changeset 6615

Timestamp:

Mar 24, 2010, 9:39:54 AM (14 years ago)

Author:

sfluecki

Message:

Grössenangaben / Ausrichtung von Close_button & Titelbar im PickupHUD angepasst. Sicherheitsabfrage des Close_buttons entfernt

Location:

code/branches/hudelements/data/gui

Files:

• layouts/InGamePickupHUD.layout (modified) (1 diff)
• scripts/InGamePickupHUD.lua (modified) (1 diff)

code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout

@@ -14 +14 @@
                         <!--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>
                         

code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua

@@ -28 +28 @@
 function P.close_button_clicked()
     hideGUI("InGamePickupHUD")
-    openDecisionPopup( "SEMI IS absolutely the BEST")
 end