WebSVN – tpanel – Diff – /trunk/tobject.cpp

             // If this widgets are deleted, Qt deletes their children.
             case OBJ_PAGE:
             case OBJ_SUBPAGE:
                 if (obj->object.widget)
+                {
-                    obj->object.widget->close();        // This deletes all childs and the window itself
+                    obj->object.widget->close();        // This deletes all childs and the widget itself
                     obj->object.widget = nullptr;
+                }
             break;
             case OBJ_VIDEO:
+    {
         if (obj->remove && (!obj->animation || obj->animation->state() != QAbstractAnimation::Running))
+        {
             if (obj->type == OBJ_SUBPAGE && obj->object.widget)
+            {
-                delete obj->object.widget;
+                obj->object.widget->close();
                 obj->object.widget = nullptr;
+            }
             if (!prev)
+            {
         obj = obj->next;
+    }
     mutex_obj.unlock();
+}
+void TObject::invalidateAllObjects()
+{
+    DECL_TRACER("TObject::invalidateAllObjects()");
+    mutex_obj.lock();
+    OBJECT_t *obj = mObject;
+    while (obj)
+    {
+        obj->object.vwidget = nullptr;      // Because it's a union all types will be NULL
+        obj->remove = true;
+        obj->animation = nullptr;
+        obj = obj->next;
+    }
+    mutex_obj.unlock();
+}
+void TObject::invalidateAllSubObjects(ulong handle)
+{
+    DECL_TRACER("::invalidateAllSubObjects(ulong handle)");
+    mutex_obj.lock();
+    OBJECT_t *obj = mObject;
+    while (obj)
+    {
+        if (obj->handle != handle && (obj->handle & 0xffff0000) == handle)
+        {
+            obj->object.vwidget = nullptr;  // Because it's a union all types will be NULL
+            obj->remove = true;
+            obj->animation = nullptr;
+        }
+        obj = obj->next;
+    }
+    mutex_obj.unlock();
+}
 string TObject::objectToString(TObject::OBJECT_TYPE o)
+{
     switch(o)
+    {

Subversion Repositories tpanel

(root)/trunk/tobject.cpp @ 242 – Rev 215 → 217