Changeset 8703 for code/branches

Timestamp:

Jun 13, 2011, 1:49:05 AM (14 years ago)

Author:

landauf

Message:

two fixes for cegui 0.7

sometimes there's an exception while closing orxonox, but that's a bug in cegui: ​http://www.cegui.org.uk/mantis/view.php?id=423

File:

• code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) (2 diffs)

code/branches/presentation/data/gui/scripts/NotificationLayer.lua

@@ -62 +62 @@
     end
 
+    notification = string.gsub(notification, "%[", "\\%[") -- escape '[' which is used to format text since cegui 0.7
+
     local item = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/NotificationLayer/Root/Queue/" .. queueName .. "/" .. queue.last)
     item:setText(notification)
@@ -250 +252 @@
     --local item = tolua.cast(item, "CEGUI::ListboxTextItem")
     local fontMgr = CEGUI.FontManager:getSingleton()
-    if fontMgr:isFontPresent("BlueHighway-" .. queue.fontSize) then
+    if (fontMgr["isFontPresent"] and fontMgr:isFontPresent("BlueHighway-" .. queue.fontSize)) or -- cegui 0.6
+        (fontMgr["isDefined"] and fontMgr:isDefined("BlueHighway-" .. queue.fontSize)) then -- cegui 0.7
         item:setFont("BlueHighway-" .. queue.fontSize)
     else