Changeset 7351

Timestamp:

Sep 4, 2010, 5:56:35 PM (14 years ago)

Author:

dafrick

Message:

NotificationQueue now disappears if there are no notifications to be displayed. Also: "Fixed" Seg-fault.

Location:

code/branches/notifications

Files:

• data/gui/scripts/NotificationLayer.lua (modified) (6 diffs)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)

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

@@ -5 +5 @@
 P.queueList = {}
 P.nameList = {}
+P.visible = nil
 
 function P.createQueue(name, size)
     local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
     local queue = winMgr:createWindow("MenuWidgets/Listbox", "orxonox/NotificationLayer/Root/Queue/" .. name)
-    queue:setProperty("BackgroundColor", "00FFFFFF")
+    queue:setProperty("BackgroundColor", "66FFFFFF")
     root:addChildWindow(queue)
 
     queue:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, 0)))
     queue:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, 0), CEGUI.UDim(0, P.queueHeightHelper(queue, size))))
+
+    P.setVisible(queue, false)
 
     table.insert(P.queueList, queue)
@@ -50 +53 @@
         listbox:insertItem(item, listbox:getListboxItemFromIndex(0))
     end
+
+    if P.visible == false then
+        P.setVisible(queue, true)
+    end
 end
 
@@ -60 +67 @@
     local listbox = CEGUI.toListbox(queue)
     listbox:removeItem(listbox:getListboxItemFromIndex(listbox:getItemCount()-1))
+
+    if listbox:getItemCount() == 0 then
+        P.setVisible(queue, false)
+    end
 end
 
@@ -70 +81 @@
     local listbox = CEGUI.toListbox(queue)
     listbox:removeItem(listbox:getListboxItemFromIndex(tonumber(index)))
+
+    if listbox:getItemCount() == 0 then
+        P.setVisible(queue, false)
+    end
 end
 
@@ -80 +95 @@
     local listbox = CEGUI.toListbox(queue)
     CEGUI.toListbox(queue):resetList()
+
+    P.setVisible(queue, false)
 end
 
@@ -99 +116 @@
     end
     queue:setHeight(CEGUI.UDim(0, P.queueHeightHelper(queue, size)))
+end
+
+function P.setVisible(queue, visible)
+    queue:setVisible(visible)
+    P.visible = visible
 end
 

code/branches/notifications/src/modules/notifications/NotificationManager.cc

@@ -74 +74 @@
     NotificationManager::~NotificationManager()
     {
-        this->queue_->destroy();
+        //this->queue_->destroy();
     }