Changeset 7612 for code/trunk/data

Timestamp:

Nov 4, 2010, 10:57:19 AM (14 years ago)

Author:

dafrick

Message:

Reverting a change that I made some time ago.
It turns out, that CEGUI doesn't like it (on some machines, expecially on tardis) if Events for a window are defined after the child windows are defined in the .layout file.
So putting it above the child windows should be fine.

Location:

code/trunk/data/gui

Files:

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

code/trunk/data/gui/layouts/ChatBox.layout

@@ -13 +13 @@
             <!--<Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />-->
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.10,0},{0.98,0},{0.65,0}}" />
+            <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/>
             <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
                 <Property Name="Font" Value="Monofur-10" />

code/trunk/data/gui/scripts/ChatBox.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("ChatBox")
-
-function P.onLoad()
-    local window = winMgr:getWindow("orxonox/ChatBox")
-    orxonox.GUIManager:subscribeEventHelper(window, "CloseClicked", P.name .. ".ChatBoxCloseButton_clicked")
-end
 
 function P.ChatBoxCloseButton_clicked(e)